ACCUMULO-2060 Jars which are expected to be reloaded should go in lib/ext, not lib
ACCUMULO-2283 removing server-extras
ACCUMULO-2114 Starting a Constants reference for clients
ACCUMULO-2197 provide generated proxy libraries, with modified generate-thrift script which tacks on headers
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2197 updating files for this version
ACCUMULO-2283 missed a reference
ACCUMULO-2197 updating assembly for new locations
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	assemble/pom.xml
ACCUMULO-2170 Add in a tag element to the scm block

The release plugin will add in the tag elemen when it's not
present, by appending it to the last child in the scm element.
This creates a non-sorted pom, which sortpom will fail the build over.
Adding in a tag with a "stub" value will at least let the build
pass with the release plugin.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	server/extras/pom.xml