Bug 907410
Bug 975530
Merge pull request #3142 from danmcp/master

Merged by openshift-bot