master
JAVA-20555 use Java Base64 instead of deprecated Spring Base64Utils (#13941)
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2