Merge pull request #626 from cfscosta/master

Bug fix: calculate overlapping correctly
Set proper bundle for thesis upload error messages
Fixed npe in AcademicAccessRules
Moved remaining pieces of PersistentGroupMembers and UnitFiles to ist-legacy
Fixed some JSPs still using person.hasrole instead of roletypes