Fix new keywords fields for plone.app.contenttypes
Add an upgrade step for the keywords fields