Merge "Fix vfc-vnflcm docker build issue"