Merge branch '3.6.1-dev' into 'master'
3.6.1 dev See merge request nfv/SOL005!19
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
3.6.1 dev See merge request nfv/SOL005!19