Some minor docs & messages change
Merge pull request #5888 from ctomc/undertow

Some minor docs & messages change