ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Signed-off-by: Christopher Tubbs <ctubbsii@apache.org>
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/auto/simple/examples.py
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/system/auto/simple/examples.py
ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Signed-off-by: Christopher Tubbs <ctubbsii@apache.org>
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-1993 ACCUMULO-1994 make proxy useful for ruby, fix getRowRange (and test it)
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
Merge branch '1.6.0-SNAPSHOT'