Bugs 958653, 959676, 959214 and Cleaned up UserException
Merge pull request #2341 from lnader/master

Merged by openshift-bot