Bug 989856
Bug 988255
Merge pull request #3225 from lnader/master

Merged by openshift-bot