Bug 1028205
Bug 1028518
Merge pull request #4141 from danmcp/master

Merged by openshift-bot