Merge "Improve error log into vnf test step"