fix some tests (re removed js/css in plone 5)
Merge remote-tracking branch 'origin/master' into barceloneta