Merge branch 'issue#17' into 'dev-v3.3.1'

nfv/SOL006#17 - affinityOrAntiAffinityGroupId should be a leaf-list and not a list

See merge request nfv/SOL006!74