Bug 980376
Bug 982921
Merge pull request #3183 from lnader/master

Merged by openshift-bot