Merge "Base64: Reformat to match JGit style"