Enabling loading of JSON-based facts
Using JSON for configuration rather than YAML
Fixing rsr-deploy key format in JSON config files
Merging in fix from master