Merge "Add VID to onap-vfw overrides"