Merge "Update vfc-nfvo-catalog yaml template"