Support building with Java8
Indent SaslStanzas
Merge branch 'master' into sasl