Merge branch 'mediaComponentConfig' of gitlab.it-innovation.soton.ac.uk:FLAME/flame-clmc into mediaComponentConfig