ACCUMULO-2127 Add note to append hadoop2 classpath entries in example configs
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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

Also update the vfs-classloader general.classpaths example to match the rest of the examples