Merge "Modify vnf query related stuffs in vnflcm."