Merge "Update Functest jobs (please vote an do not merge)"