ACCUMULO-1968 Update incorrect example documentation
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-1852 Further fixes nativemap test on OSX

To make it work on my system I had to add this bit
to the include path for executing the test.

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.6.0-SNAPSHOT'