ACCUMULO-3048 More CHANGES
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2991 Fix formatting to show asterisk
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
ACCUMULO-3062 Get a Connector using the proper ClientConfiguration.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3063 Ignore maven-plugin-plugin in m2e
Merge branch '1.6.1-SNAPSHOT'