Bug 956651
Bug 956050 956043
Merge pull request #2258 from bdecoste/master

Merged by openshift-bot