fix test which was barfing on line breaks
Merge branch 'master' into 20130709-tool-install-auth