Merge proposals dependent on lp://staging/~ci-train-bot/address-book-service/address-book-service-ubuntu-yakkety-2057

1. address-book-service-ubuntu-yakkety-2057
2. Dependent merge proposals