CONN-231: Straightening out certs backend WIP.
CONN-231: Fix for Cert mix up issue.
Merge pull request #50 from msweaver/CONN-231

CONN-231: Straightening out certs backend WIP.