fix some tests (re removed js/css in plone 5)
Merge branch 'master' into mockup-issue-221

* master:
  fix some tests (re removed js/css in plone 5)