Bug 999891
Bug 999826 and 999892
Updated docs after bug fixes
Merge pull request #3503 from lnader/master

Merged by openshift-bot