ACCUMULO-2078 Fix the grep so that the example configurations are properly interpreted.
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