Fixing origin extended tests
Merge pull request #3893 from abhgupta/abhgupta-dev

Merged by openshift-bot
Remove whitespace and haml that was commented out and not needed
Merge branch 'master' of github.com:openshift/origin-server into console_light_theme_dev