rename tls to ejabberd_tls to avoid conflicts with ssl tls module
Merge branch 'reltool-error'
asn1 for R16B01