Some plone 4.3 adaptations
Merge remote-tracking branch 'starzel/master' into noreg_order