Merge "Fix vfc-vnflcm notify bug" into amsterdam