Merge pull request #2065 from pentaho-nbaker/5.2

[BISERVER-12146] Reverting configuration change made for BISERVER-11584 ...
[BACKLOG-824] Adding defensive code to handle null setting.