Merge proposals dependent on lp://qastaging/~james-page/charms/trusty/midonet-api/review-fixes

lp://qastaging/~james-page/charms/trusty/midonet-api/review-fixes has no merge proposals.