Merge proposals dependent on lp://staging/~sdn-charmers/charms/trusty/odl-controller/trunk

lp://staging/~sdn-charmers/charms/trusty/odl-controller/trunk has no merge proposals.