Allow Cert/Key file locations to be overridden
Merge pull request #324 from andymcc/custom_cert

Merged automatically by jenkins after successful build test