bz1151744 - wrap the wait for reload to finish inside of the lockfile
Merge pull request #5885 from rajatchopra/master

Merged by openshift-bot