Merge pull request #2598 from reaperhulk/index-cp

support indexing in CertificatePolicies