Merge proposals dependent on lp://qastaging/~indicator-temp-team/indicator-temp/trunk-packaging

1. trunk-packaging
2. Dependent merge proposals