Merge proposals dependent on lp://staging/~ci-train-bot/history-service/history-service-ubuntu-yakkety-landing-052

1. history-service-ubuntu-yakkety-landing-052
2. Dependent merge proposals