Merge "Update Functest jjobs (patrole)"