Merge davidv/portfix

Fixing an issue where the destination port(if non standard) was lost during processing
Fixing an issue where a lot of database contention might cause a disconnect
Fixing an issue on the Groups page where an incorrect request could be made(browser dependent)