avoiding unnecessary mongo queries and fixing routes constraints
Merge pull request #1453 from abhgupta/abhgupta-dev

Merged by openshift-bot