Bug 960812
Merge pull request #2436 from danmcp/master

Merged by openshift-bot
Bug 961227
Merge pull request #2438 from danmcp/master

Merged by openshift-bot