Corrected the incorrect fix put in for bug 915673
updated unit test
Merge pull request #1815 from lnader/master

Merged by openshift-bot