Merge proposals dependent on lp://qastaging/~rconradharris/nova/server_progress

lp://qastaging/~rconradharris/nova/server_progress has no merge proposals.