[MERGE] forward port of 7.0 until revision 9546 (launchpad_translations_on_behalf_of_...