Merge proposals dependent on lp://qastaging/~robert-ayres/charms/trusty/nova-compute/contrail

lp://qastaging/~robert-ayres/charms/trusty/nova-compute/contrail has no merge proposals.