Fix for bug 1018450
Adding test case
Merge pull request #3878 from abhgupta/abhgupta-dev

Merged by openshift-bot