ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java

1.6 should already interpolate correctly due to changes in Property and AccumuloConfiguration.
ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	conf/examples/2GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/standalone/accumulo-site.xml

Also fixed the formatting in 2GB-standalone as it didn't match everything else.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	conf/examples/1GB/native-standalone/accumulo-site.xml
	conf/examples/1GB/standalone/accumulo-site.xml
	conf/examples/2GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/standalone/accumulo-site.xml
	conf/examples/3GB/native-standalone/accumulo-site.xml
	conf/examples/3GB/standalone/accumulo-site.xml
	conf/examples/512MB/native-standalone/accumulo-site.xml
	conf/examples/512MB/standalone/accumulo-site.xml

Also updated the vfs-classloader and crypto example configs
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
Merge branch '1.6.0-SNAPSHOT'