Resolve L2SDP-277

Reinier van der Wallerequested to merge
L2SDP-277 into master

Closes L2SDP-277. Correcting the .yaml and mmap files will be done in L2SDP-279

Merge request reports