make constrain contenttypes form work and fix problem with form unload triggering
Merge branch 'master' of git://github.com/plone/mockup