Updated the Base64 Encoder to use apache commons, rather than Java8 Base64 encoder