Merge "Fix container cleanup in test_account_bulk"