Merge proposals dependent on lp:~cjohnston/uci-engine/deploy-upgrade

lp:~cjohnston/uci-engine/deploy-upgrade has no merge proposals.