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
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2767 Convert latex to markdown.
ACCUMULO-2722 Remove throws Exception which isn't actually thrown.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/Merge.java
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2649 Move the new test class to the new mapreduce module
ACCUMULO-2850 Add enhanced memory stress test scripts

New scripts for the memory stress test make it easy to start and stop multiple
reader and writer processes, in a manner similar to continuous ingest. See the
updated README.md for information on how the scripts are used.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	test/system/stress/README.md
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2646 Generate config examples in assembly

  This patch removes unnecessary static configuration files, and instead
  replaces them with generated ones, to simplify improvements to example config
  files. This also gets some consistency in examples. The assembly component
  descriptor is cleaned up a bit by moving assembly-related files into the
  assemble module and by dropping some relative paths and vestigial file sets.
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	conf/examples/1GB/standalone/log4j.properties
	conf/examples/2GB/native-standalone/log4j.properties
	conf/examples/2GB/standalone/log4j.properties
	conf/examples/3GB/native-standalone/log4j.properties
	conf/examples/3GB/standalone/log4j.properties
	conf/examples/512MB/native-standalone/log4j.properties
	conf/examples/512MB/standalone/log4j.properties
	conf/templates/log4j.properties
ACCUMULO-2646 Move example config generation to script

  An external script is a bit cleaner than calling bash inline in the pom.xml