Revert "Revert "Reorder ServerConfig.Key to hide advanced config at the end of the file""

This reverts commit 4a26acff5b5dc820a5e78fdbf046c349a3b43c81.