Merge "Create a SafeCleanerRule so cleanup failures don't hide test failures."