Fix routing clashes when id matches new or edit
Fix mock test cases for the new routes used by the console
Merge pull request #2509 from jwforres/route_id_clash

Merged by openshift-bot