Merge remote-tracking branch 'dgoulet/ticket30454_035_01'

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

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

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

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

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