Make ZAP optional for PLAIN mechanism
Merge pull request #587 from hurtonm/master

Make ZAP optional for CURVE mechanism