Try to fix spurious 002.cf test failures.
Merge pull request #1559 from jimis/agent_protocol_version

Try to fix spurious 002.cf test failures.