Add check to see if public entities are linked to the ed or hierarchy
Merge branch 'ds-917' of https://github.com/inbloomdev/datastore into ds-917