Merge pull request #2069 from pentaho-nbaker/5.2

[BACKLOG-824] Adding defensive code to handle null setting.
Revert "[BISERVER-11603] Encoding/Decoding - Not able to upload a file or folder"

This reverts commit a9f68932d29400009f94fba0c01325ce1b035e54.