Limit initial build client output to 10Kb

Following an Initial-Build, limit the capture of client_message
data to 10Kb.
Merge pull request #5021 from ironcladlou/initial-build-limiting

Merged by openshift-bot
Merge pull request #5029 from danmcp/master

Fixing extended tests