Merge branch 'master' into feature/cmake

diff --cc .gitlab-ci.yml
Simple merge

diff --cc tools/ci/executable-list.txt
index a6c44996c7b6bb82ea9ca7a086649add6bd438f7,79fcb31dc23a3998c46af8fdbb07f1c50eb9691e..3579a6e9dc5dfcede280826c1b2bbf561071ca9e
--- 1/tools/ci/executable-list.txt
--- 2/tools/ci/executable-list.txt
+++ b/tools/ci/executable-list.txt
@@@ -37,25 -31,13 +37,27 @@@ tools/idf.p
  tools/idf_monitor.py
  tools/idf_size.py
  tools/kconfig/check.sh
 +tools/kconfig/conf
  tools/kconfig/lxdialog/check-lxdialog.sh
 +tools/kconfig/mconf
  tools/kconfig/merge_config.sh
  tools/kconfig/streamline_config.pl
 -tools/kconfig/conf
 -tools/kconfig/mconf
 -tools/windows/eclipse_make.sh
 -tools/test_idf_monitor/run_test_idf_monitor.py
 +tools/kconfig_new/confgen.py
 +tools/kconfig_new/confserver.py
 +tools/kconfig_new/test/test_confserver.py
  tools/mass_mfg/mfg_gen.py
 +tools/test_idf_monitor/run_test_idf_monitor.py
  tools/unit-test-app/unit_test.py
 +tools/windows/eclipse_make.sh
 +tools/ci/build_examples_cmake.sh
 +tools/ci/test_build_system_cmake.sh
 +tools/ci/check_examples_cmake_make.sh
 +tools/cmake/convert_to_cmake.py
 +tools/cmake/run_cmake_lint.sh
 +tools/idf.py
 +tools/kconfig_new/confgen.py
 +tools/kconfig_new/confserver.py
 +tools/kconfig_new/test/test_confserver.py
 +tools/windows/tool_setup/build_installer.sh
+ tools/test_idf_size/test.sh
++

diff --cc tools/idf_size.py
Simple merge