[#580] Fix resource edit errors losing info
Merge branch '580-resource-edit-error'
Merge branch 'master' of github.com:okfn/ckan