Merge proposals dependent on lp://qastaging/~hopem/charms/trusty/nova-compute/fix-config-restart-svc-race

lp://qastaging/~hopem/charms/trusty/nova-compute/fix-config-restart-svc-race has no merge proposals.