ACCUMULO-3070 Use dynamically set log4j port and not hard-coded.
Merge branch '1.6.1-SNAPSHOT'