Fix missing baseurl and dexterity compatibility.
Merge branch 'master' into plone5