Merge branch 'bug26627_033' into bug26627_033_merged_master

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

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

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

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

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

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