changes to the defaults to make certs work in a single instance
Merge remote-tracking branch 'origin' into jarv/cert-fixes
Merge pull request #401 from edx/jarv/cert-fixes

Jarv/cert fixes