Merge proposals dependent on lp://staging/~hloeung/ubuntu-repository-cache/metadata-sync-include-in-progress-ubuntu-next

1. metadata-sync-include-in-progress-ubuntu-next
2. Dependent merge proposals