[1879] Moved server configuration settings into a singleton
[#1879] resolve conflict on iRODS/server/config/server.config.in (using mine)