Bug 1063142 - Ignore .stop_lock on gear operations

* Update code and tests

Conflicts:
	controller/test/cucumber/platform-idler.feature
Merge pull request #4711 from jwhonce/stage

Merged by openshift-bot