openshift/origin-server — pull request #4711 by jwhonce (2014-02-10 20:16:06+00:00)
Title: [TO_STAGE] Bug 1063142 - Ignore .stop_lock on gear operations

* Update code and tests

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