Merge proposals dependent on lp://qastaging/~openstack-charmers/charms/trusty/nova-compute/backport-fix-lp1448143

lp://qastaging/~openstack-charmers/charms/trusty/nova-compute/backport-fix-lp1448143 has no merge proposals.