Revert "Revert "Fixed server not being listed on master server"" This reverts commit ac8983ee949501dec4a241e3494a57fa7cc61de3.