Bug 957442
Bug 969940
Merge pull request #3319 from danmcp/master

Merged by openshift-bot