Merge proposals dependent on lp:~canonical-isd-hackers/canonical-identity-provider/fix-translatable-strings

1. fix-translatable-strings
2. Dependent merge proposals