Change libotr 4.0.0 code to use only OTR spec v2
Merge branch 'master' into gmail