[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_...