Merge proposals dependent on lp:~james-page/charm-helpers/ovs-upstart-fix

lp:~james-page/charm-helpers/ovs-upstart-fix has no merge proposals.