PWF upgrade, locales2

* Converted to pwf locales2 api
PWF upgrade

* Fixed intranet for locales2 pwf api
Hotfixes