Merge "Fix Base64OutputStream swallowing/throwing the wrong exception."