Merge pull request #81 from mwbutcher/master

adding new keys and supporting files for catalog zero tests
Fix certs (again)
Merge pull request #82 from cprice404/master-agent-certs

This change shouldn't affect QA/QE, so i'm pulling it in.  Fix certs (again)