Merge conflicts in ClientConnection change

Implement (e)rror (404) command.

Fix obvious bugs in 0.4 caused by partial server side persistent conn…

…ection support

0.4 release adding client side keep-alive support.