some cleanup and SASL start (work in progress)
..
Merge branch 'master' into authentication
disabled sasl
Merge branch 'master' into authentication
Merge branch 'master' into authentication
Merge branch 'master' into authentication