Fixed certificate setup
Merge pull request #924 from christav/fix-service-cert

Fix service cert