Move form macro changes from CKAN to Kata