Merge proposals dependent on lp://staging/~robru/unity-webapps-tiberiumalliances/packaging-fixups

1. packaging-fixups
2. Dependent merge proposals