Merge "Use former calls to running Functest in Danube"