Merge proposals dependent on lp://qastaging/~doanac/ubuntu-ci-services-itself/upgrade-support

1. upgrade-support
2. Dependent merge proposals