ACCUMULO-3070 Use dynamically set log4j port and not hard-coded.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3071 Add replication thrift service ports to user manual default ports.
ACCUMULO-3072 Split the test into multiple methods and use proper assertions
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	test/src/test/resources/log4j.properties
ACCUMULO-3021 Added constraint for max size of end rows

Signed-off-by: Keith Turner <kturner@apache.org>