Merge proposals dependent on lp:~ci-train-bot/ubuntu-system-image/system-image-ubuntu-xenial-landing-023

1. system-image-ubuntu-xenial-landing-023
2. Dependent merge proposals