Fix bug when removing zone hvac heat pump

Prior to this fix when heat pumps containing water supplemental heating
coils were removed, the coil was not properly removed from plant.

[fixed #66351890]
Merge branch 'develop' of https://github.com/NREL/OpenStudio into develop