Disable local gear only after a remote gear is UP or there is a timeout.
Merge pull request #2704 from mrunalp/stage

Merged by openshift-bot