Merge proposals dependent on lp://staging/~cjwatson/launchpad/translation-import-queue-entry-dsp-vocab

1. translation-import-queue-entry-dsp-vocab
2. Dependent merge proposals