Merge "Remove heat tests from patrole"