Merge branch 'release-1.3' into development
Merge branch 'release-1.4'
remove incompatible version of plone.app.portlets and change the varnish config in staging to round-robin
Merge branch 'release-1.4'