Merge proposals dependent on lp://qastaging/~charlesk/indicator-session/lp-1318980-fix-translation-install-dir

1. lp-1318980-fix-translation-install-dir
2. Dependent merge proposals