Bug 1122809
Bug 1122515
Merge pull request #5666 from lnader/master

Merged by openshift-bot