tools/migration/migrator/prosody_files: Fix undefined global access of ?error?, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
mod_s2s: Include IP in log messages, if host is unavailable
mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)
mod_tls: Log error when TLS initialization fails
Tagging 0.9.3
Merge 0.9->0.10
Merge
Merge 0.10->trunk