ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	bin/accumulo
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	bin/accumulo