Merge proposals dependent on lp://qastaging/server-env-tools

lp://qastaging/server-env-tools has no merge proposals.