Merge proposals dependent on lp://staging/~hloeung/ubuntu-repository-cache/fix-metadata-age-unit-test

1. fix-metadata-age-unit-test
2. Dependent merge proposals