Merge "Update Functest jobs"