Cleanup and converge service port numbers everywhere
See individual commits for details.
I believe I've changed port numbers everywhere it matters. They are now consistent.
Edited by Igor DC
See individual commits for details.
I believe I've changed port numbers everywhere it matters. They are now consistent.