Merge branch 'issue#9' into 'dev-v2.8.1'

nfv/SOL006#9 - Fix the change in NFVIFA(18)00503 that changed the...

See merge request nfv/SOL006!65