Bug 1063142 - Ignore .stop_lock on gear operations

* Update code and tests