Merge config doc and test updates.

svn path=; revision=84462