Merge branch 'develop' into 'fix_upf_selection_09_11'

# Conflicts:
#   build/scripts/build_helper

build/scripts/build_helper

@@ -135,8 +135,7 @@ check_supported_distribution() {
         "rhel8.4")       return 0 ;;
         "rhel8.5")       return 0 ;;
         "rhel8.6")       return 0 ;;
-        "rhel8.7")       return 0 ;;                
-        #"centos7")     return 0 ;;
+        "rhel8.7")       return 0 ;;
     esac
     return 1
 }