Bug 971204
Bug 974493
Merge pull request #2851 from lnader/master

Merged by openshift-bot