Fix issues w/ V1 stop lock
Merge pull request #2251 from pmorie/dev/v1_stop_lock

Merged by openshift-bot