ACCUMULO-1819 Update Makefile for native map to build on new OSX version
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	server/src/main/c++/nativeMap/Makefile
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1819 Screwed up the merge conflict
Merge branch '1.5.1-SNAPSHOT'