Merge "Add missing code for enabling VNF LCM features"