Bug 914639
Bug 895507
Merge pull request #1452 from danmcp/master

Bug 914639
Merge pull request #1454 from bdecoste/master

Merged by openshift-bot