Merge branch 'bug#227' into 'master'

Bug#227 NFVSOL(18)000772 Comment 1

See merge request nfv/SOL006!41