Bug 987799
Bug 982107
Bug 982921
Merge pull request #3174 from lnader/master

Merged by openshift-bot