Merge branch 'release/2.8.0.1' into develop
[Nereid] Migrate nereid-cms to 3.0 #3128

* Removed en_US from urls
* Modified tests to work

Project-ID: 989
Task-ID: 3128
Merge pull request #26 from uditagarwal/develop

[Nereid] Migrate nereid-cms to 3.0 #3128
Merge branch 'release/3.0.1.0'