bz1147054 - use common lockfile
Merge pull request #5842 from rajatchopra/master

Merged by openshift-bot