Merge proposals dependent on lp://staging/~niedbalski/charms/trusty/nova-cloud-controller/fix-lp-1308557

lp://staging/~niedbalski/charms/trusty/nova-cloud-controller/fix-lp-1308557 has no merge proposals.