the fix for de-917 ???

removed insane merging of ed org context rights for public entities.