Merge branch 'ticket40237_044_01' into ticket40237_045_01

diff --cc src/core/mainloop/mainloop.c
Simple merge

diff --cc src/feature/hs/hs_cache.c
Simple merge

diff --cc src/feature/hs/hs_client.c
Simple merge

diff --cc src/feature/hs/hs_common.c
Simple merge

diff --cc src/feature/hs/hs_service.c
Simple merge

diff --cc src/feature/nodelist/nodelist.c
Simple merge

diff --cc src/test/test_hs_client.c
Simple merge

diff --cc src/test/test_hs_common.c
Simple merge

diff --cc src/test/test_hs_service.c
Simple merge

diff --cc src/test/test_shared_random.c
Simple merge