another attempt at a fix (previous worked in testing)
Merge branch 'update_rack'
update rails, json
Merge branch '2.3.17' into development