Update import locations and make p4a.subtyper compatible with Plone 4.3.