Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1931 Javadoc for core/data

Signed-off-by: Josh Elser <elserj@apache.org>
ACCUMULO-1974 Javadoc for core/conf.

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'