Restore the JSON manipulation utilities

Our deployment system still uses those
Merge branch 'develop'