Updated to fix problem with general apply form
Merge branch '2.0' of github.com:datagovuk/ckanext-dgu into 2.0