Revert "#560 - Fix server config validation issues."

This reverts commit dfc8668bb1caf8cd897ee673990d4db1833be7b6.
Merge pull request #615 from arvindsv/fix_wrong_test_which_changed_system_env

Revert "#560 - Fix server config validation issues."