JSON Persistence Updates
Updates to folder handling in JSON persistence and addition of
functionality allowing for keys which are not valid folder names in the
persisted JSON object.