Merge proposals dependent on lp:~jamesodhunt/livecd-rootfs/ubuntu-core-configure-system-image-client.ini

1. ubuntu-core-configure-system-image-client.ini
2. Dependent merge proposals