Merge proposals dependent on lp://staging/~dbarth/cordova-cli/update

lp://staging/~dbarth/cordova-cli/update has no merge proposals.