ServerProtocol is dead.  Long live HttpVersion.
Merge branch 'topic/http-version' into develop