avoiding unnecessary mongoid calls
Merge pull request #1439 from abhgupta/abhgupta-dev

Merged by openshift-bot