CMS-4529 Content Permissions - Merge inherited and non-inherited permission lists

- added inherited property to AccessControlEntry in java to match that in javascript
- updated test