Merge "Fix URL in VIM and VNFM query"