Merge "compute: Wait until server is ACTIVE before deleting during resource_setup"