Removed funky redirect to default, code cleanup

* getting ready for common landing page - getting rid of non-english redirect
* Removed test code for ESI
* Passing around $langCode instead of $lang

Change-Id: Ib1cf9b172d69f8efb625735b407adf35780863ad
Merge "Removed funky redirect to default, code cleanup"