ACCUMULO-3045 Update user manual for CredentialProviderToken.
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/asciidoc/chapters/administration.txt
	docs/src/main/asciidoc/chapters/clients.txt