Openshift origin release 3

Merged in PRs:
* 4287
* 4291
* 4298
* 4318
* 4325
* 4326
* 4327
* 4333
* 4340
* 4344
* 4345
* 4346
* 4353
* 4354