BouncyCastle dependency upgrade
Recording .gitmergeinfo Changes