Merge "Use addClassResourceCleanup in test_container_sync"