Merge pull request #16285 from calavera/cleanup_volumes_when_create_fails

Remove volume references when container creation fails.