[ckan-dev] 1.8 branched

[Sean Hammond]

Hey Adria, these two commits need to be cherry-picked into 1.8 before I
update the pot file:

https://github.com/okfn/ckan/commit/0bdaf23147f518e45a10bb181b83507ab45f45b1

https://github.com/okfn/ckan/commit/9acc9ea27723ed4ee90380512652f7c37114b18f

I thought I'd ask you rather than just doing it myself (but let me know
if you want me to just cherry-pick them myself)