Added options for SASL and TLS configuration.
Merge branch 'master' of https://github.com/buddycloud/buddycloud-media-server.git
Removing radix from parseInt in timeout parsing. Conf values added to
properties as strings.