Merge proposals dependent on lp://staging/~jason-hobbs/charms/trusty/odl-controller/add-unit-tests

lp://staging/~jason-hobbs/charms/trusty/odl-controller/add-unit-tests has no merge proposals.