Merge proposals dependent on lp://qastaging/~tvansteenburgh/charms/trusty/nova-compute/fix-tests

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