Bug 970933 - CLI backgrounds are incorrect
Bug 972757: Allow vendor names to start with a numeral

This allows vendor names such as '10gen'.

Also disallow vendor name to end with an underscore.
Fix routing clashes when id matches new or edit
Fix mock test cases for the new routes used by the console
Merge pull request #2801 from smarterclayton/bug_970933_to_master

Merged by openshift-bot
Merge pull request #2509 from jwforres/route_id_clash

Merged by openshift-bot
Merge pull request #2805 from BanzaiMan/dev/hasari/bz972757

Merged by openshift-bot