Added a fix for the Studio with unit test
Fix redirectUrl to work with studio
Merge branch 'master' into 'BS-6674_TenantMaintMode'