Translate and ULS to master

This fixes TUX for anonymous users since TUX depends on parts
of ULS. Also other fixes for TUX to allow us test it more
before enabling it by default.

Change-Id: Ie16cae0d4cf7bf84a61c6547faa0e1db2382073a