Merge "Make delete_container use expected_success"