ACCUMULO-1722: Reworked the user permissions
Sorted the properties to make it easier to diff
Added support for namespaces
Merge branch '1.6' for ACCUMULO-1722
ACCUMULO-3167 Fix javadoc typo/tag usage
Merge branch '1.6'