Merge "Update Functest jobs to manage new branches"