(cherry picked from commit b23a6aeaff403266491ea75207558bf9917b9cc4) # Conflicts: # src/server/bnetserver/bnetserver.conf.dist
(cherry picked from commit b23a6aeaff403266491ea75207558bf9917b9cc4) # Conflicts: # src/server/bnetserver/bnetserver.conf.dist