Merge "Improve SSL support for Sensu"