Merge proposals dependent on lp:~robert-ayres/charms/trusty/contrail-configuration/trunk

lp:~robert-ayres/charms/trusty/contrail-configuration/trunk has no merge proposals.