1125030 - Handle both styles of certificate stores.
Merge branch 'pulp-2.4' of github.com:pulp/pulp into pulp-2.4
Merge branch 'pulp-2.4'