Merge changes I97a8f820,Ifd02328f

* changes:
  Add missing test cert
  Add policy checking info