Bug 876087
make test react to weirdness of controller
Merge pull request #1223 from danmcp/master

Merged by openshift-bot