Router pr303 combined

Includes change from @rajatchopra to not delete the entire frontend when removing an alias and unit test for said functionality.  Replaces https://github.com/openshift/origin/pull/303 
Though it doesn't really matter so much since this code is probably going away soon