Add the Socket Identity info to the ZAP Messages

This change adds the socket identity information from the socket to the
zap frames.  In doing this the ZAP is able preform different operations
based on different sockets.  This is not compatible with the current ZAP
RFC, but that can be updated.  As the ZAP RFC is currently draft for I
did not change the version number.

Tests also modified and passing.