Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev