Merge proposals dependent on lp://qastaging/~zulcss/openstack-charm-testing/lxd-updates-16Jun

1. lxd-updates-16Jun
2. Dependent merge proposals