Merge proposals dependent on lp://staging/~charlesk/indicator-session/lp-1354058-use-standard-translations-cmake-file

1. lp-1354058-use-standard-translations-cmake-file
2. Dependent merge proposals