TIMOB-14331 Rename two base64 methods to avoid conflicts
Merge pull request #4617 from BlainHamon/timob-14331_3_1_X

TIMOB-14331 Rename two base64 methods to avoid conflicts