Apply modifications done in OPNFV functest project