Merge proposals dependent on lp://staging/~bcsaller/charm-tools/fixsetuptools

lp://staging/~bcsaller/charm-tools/fixsetuptools has no merge proposals.