Remove merge conflict with bad streaming socket timeout (#762)
Remove merge conflict with bad streaming socket timeout (#762)


vishnu2kmohan/dcos-commons,comptelfwd/dcos-commons,vishnu2kmohan/dcos-commons,comptelfwd/dcos-commons,comptelfwd/dcos-commons,mesosphere/dcos-commons,mesosphere/dcos-commons,vishnu2kmohan/dcos-commons,comptelfwd/dcos-commons,comptelfwd/dcos-commons,mesosphere/dcos-commons,mesosphere/dcos-commons,mesosphere/dcos-commons,vishnu2kmohan/dcos-commons,vishnu2kmohan/dcos-commons,comptelfwd/dcos-commons