Merge proposals dependent on lp:~tvansteenburgh/charms/trusty/nova-cloud-controller/fix-tests

lp:~tvansteenburgh/charms/trusty/nova-cloud-controller/fix-tests has no merge proposals.