Bug 1063142 - Ignore .stop_lock on gear operations

* Update code and tests
Merge pull request #4710 from jwhonce/bug/1063142

Merged by openshift-bot