Update for latest upstream CKAN changes

To use this you need to be running the latest canada-v2.0 branch of CKAN: https://github.com/open-data/ckan/commit/047378d38931d11b94a61749388e9606fe6e6ec0