Merge "Fix Patrole jobs in Functest multijobs"