Merge "Track update to bouncycastle 1.54"