Merge branch 'feat/hackfest-r2.1' of https://labs.etsi.org/rep/tfs/controller into feat/hackfest-accumulated-fixes