[#1273] fix some tests
Merge branch '1273-resource-uploads' of github.com:okfn/ckan into 1273-resource-uploads
[#1273] fix some more tests