Modify gvnfm-vnflcm code and unit tests

No match.