Merge proposals dependent on lp://staging/~serge-hallyn/upstart/upstart-fix-cgm-env-tests

lp://staging/~serge-hallyn/upstart/upstart-fix-cgm-env-tests has no merge proposals.