Fix code review remarks, merge develop, revert some merge errors

ci-scripts/Jenkinsfile-GitLab-Container

ci-scripts/Jenkinsfile-gitlab

ci-scripts/args_parse.py

ci-scripts/buildOnVM.sh

ci-scripts/cls_containerize.py

ci-scripts/createVM.sh

ci-scripts/html.py

ci-scripts/main.py

ci-scripts/reportBuildLocally.sh

ci-scripts/waitBuildOnVM.sh

ci-scripts/xml_class_list.yml

common/utils/assertions.h

common/utils/system.c

common/utils/system.h

common/utils/threadPool/thread-pool.h

common/utils/threadPool/thread-pool.md

executables/main-ocp.c

executables/nr-gnb.c

executables/nr-ru.c

executables/nr-softmodem.c