[MERGE] Improve test coverage, and fix a bug revealed by the improved coverage.

[John Arbash Meinel]

Andrew Bennetts wrote:
> While working on the smart server code I noticed a discrepancy between the tests
> in TestSmartProtocolOne and TestSmartProtocolTwo.  I thought I'd pointed out
> this particular discrepancy when reviewing the change that added it, but I guess
> it got lost at some point.
> 
> I'm working on improving the tests so that the different protocol versions won't
> accidentally have differing amounts of test coverage.  In the meantime, here's a
> fix for the immediate problem.  It moves a test from TestSmartProtocolOne into
> CommonSmartProtocolTestMixin, and fixes the bug in the protocol v2 code that
> this reveals.
> 
> -Andrew.
> 
> 

BB:approve