Merge "Additional PKCS#7 test cases."