Merge "Refactor vnf-onboarding to make VNF choice configurable"