Merge "TestKeyStore: add the ability to set certificate serial numbers" into nyc-dev