HRCPP-74 TopologyId is not updated from topology response

DO NOT integrate. This PR is untested and needs review, feedback and testing before being integrated.