fix plone3 issue
Prepare plone.app.dexterity 1.2.1.
merge 1.x branch with changes that were released in 1.2.1 but never pushed