Applying security and bug fixes to Plone