Add package "free extra" fields back in to form

This requires the release-v2.2.1-barnet branch from
github.com/okfn/ckan-barnet, or it will break things!