Restore plone5 branch
Merge branch 'plone5'
Update allowed Travis-CI -failures
Backport IResource-/IBundleRegistry-interfaces for Plone 4