Clarify env.passwords' requirement of full host strings.

Re #1130, closes #1130.
Fix up new encoding subroutine to work within test suite
Merge branch '1.7' into 1.8
Merge branch '1.8' into 1.9