Merge "Rename vnf-onboarding metaswitch files"