Split plain_mechanism into client and server part
Merge pull request #1023 from hurtonm/master

Split plain_mechanism into client and server part