Merge "Wait for resource deletion after 202 response. Fixes bug 1007447."