Merge "Add code to support keystore certificate post processing." into main