Cleanup for replacement of admin console with user-console
Merge branch 'master' of github.com:eucalyptus/eucadev