Merge Request issue.

Re committing VNFPM files.
1 job for NFV-SOL005-Review
in 0 seconds, using 0 compute credits, and was queued for 9 seconds