Your diff got probably mixed up, since it proposes partly the changes, that I made two days ago.
Anyhow, all element of "currentServerLocations" should go through the method "qualified_location". You were right, this was still missing when updating it on a node running on a server with a default port. I have updated it in the repository.
Sorry for the slow reactions. I am currently fully booked with other obligations. Obviously, all testing and setups on our side were made with non-default ports. Furthermore, due to rearrangements of the server infrastructure of our institution, I have lost my testing environment, where I can do cluster testing. It will take some more time until I can reestablish it.