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