Merge "Updated properties for VNFM adpater"