Merge branch 'subsystems'

diff --cc src/app/config/config.c
Simple merge

diff --cc src/app/main/main.c
Simple merge

diff --cc src/lib/thread/.may_include
index fc56f4683649b97c4de298cd1c5c4e9c43d60f72,c26a426923db6fa7311ab8c7cfdfffdf9e29c7d3..02711348c524ff0a6608033270ea5afe5fede1b6
--- 1/src/lib/thread/.may_include
--- 2/src/lib/thread/.may_include
+++ b/src/lib/thread/.may_include
@@@ -2,6 -2,6 +2,7 @@@ orconfig.
  lib/cc/*.h
  lib/lock/*.h
  lib/log/*.h
+ lib/subsys/*.h
  lib/testsupport/*.h
  lib/thread/*.h
 +lib/wallclock/*.h