ACCUMULO-2991 Fix formatting to show asterisk
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex