Merge "Cleanup functest jobs"