Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_config.c