Merge "Wrap ceilometer-upgrade in boostrap_host_exec"