Merge proposals dependent on lp://qastaging/~indicator-network-developers/ubuntu-connman-test/trunk.packaging

1. trunk.packaging
2. Dependent merge proposals