HORNETQ-408 - Revamp SSL