Merge branch 'issue#26' into 'dev-v3.5.1'
issue#26 Fixes for IFA011ed341 based on 942 part1, part2 and part3 See merge request nfv/SOL006!83
WARNING! Gitlab maintenance operation scheduled for Saturday 28th March from 8 a.m. (CET) to approximately 3 p.m. (CET). GitLab will be unavailable during this time.
issue#26 Fixes for IFA011ed341 based on 942 part1, part2 and part3 See merge request nfv/SOL006!83