ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java