Merge "Update Functest slaves"