Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-html5-theme/ubuntu-html5-theme-ubuntu-yakkety-landing-067

1. ubuntu-html5-theme-ubuntu-yakkety-landing-067
2. Dependent merge proposals