Merge "vnf mrket place refactor code"