ACCUMULO-2262 Set java.net.preferIPv4Stack when starting accumulo processes
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	conf/examples/1GB/native-standalone/accumulo-env.sh
	conf/examples/1GB/standalone/accumulo-env.sh
	conf/examples/2GB/native-standalone/accumulo-env.sh
	conf/examples/2GB/standalone/accumulo-env.sh
	conf/examples/3GB/native-standalone/accumulo-env.sh
	conf/examples/3GB/standalone/accumulo-env.sh
	conf/examples/512MB/native-standalone/accumulo-env.sh
	conf/examples/512MB/standalone/accumulo-env.sh
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2264 Up the walog max size so it doesn't break by default on hadoop2
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/system/auto/stress/restart.py
Merge branch '1.6.0-SNAPSHOT'