ACCUMULO-1.5.1-SNAPSHOT need to store location without full path
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1.5.1-SNAPSHOT need to store location without full path
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
ACCUMULO-1428 Documenting native maps
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1222 Move resources from server to test and cleanup a not-so-useful
test case
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1492 Add the -H option to `find` to follow symlinks when looking for
the log4j jar.
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1576 Applying patch by [~jmhsieh] to clean up scripts in the continuous
ingest test suite
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1576 Adding some quoting to the pkill patterns in the continuous ingest
test suite stop scripts to prevent shell-expansion of said patterns.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/continuous/stop-batchwalkers.sh
	test/system/continuous/stop-ingest.sh
	test/system/continuous/stop-scanners.sh
	test/system/continuous/stop-walkers.sh
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1730 set offsets for AND and OR parse nodes
ACCUMULO-1730 set offsets for AND and OR parse nodes
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1299 removed unneeded hdfs port from test