Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/crhelmrich/VVCSoftware_VTM into M0091-Part-2-of-2-QPA-Finalization
replace newly added mean() function by recently added computeAvg() function, remove mean() function again