Fix secure connection support
Merge branch 'issue8' into secure-connections
Merge pull request #21 from Metaswitch/secure-connections

[Reviewer: Tim] Fix secure connection support