[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf...