Bug 902286
Merge pull request #1224 from danmcp/master

Merged by openshift-bot
Bug 902672
Merge pull request #1225 from danmcp/master

Merged by openshift-bot