Merge "Update vfc-vnfm nokia and huawei yaml template"