Merge pull request #4687 from jwhonce/stage

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.19.20-1].
Automatic commit of package [openshift-origin-node-util] release [1.18.9-1].
Bug 1063142 - Ignore .stop_lock on gear operations

* Update code and tests

Conflicts:
	controller/test/cucumber/platform-idler.feature