Merge "Refactor vfc-vnflcm query_resource logic"