Work around cert issues on solaris and windows

This should allow the tests to work.
Merge pull request #244 from mhaskel/work_around_cert_issues

Work around cert issues on solaris and windows
Merge remote-tracking branch 'upstream/1.1.x' into merge_1.1.x
Merge pull request #245 from mhaskel/merge_1.1.x

Merge 1.1.x