FLUME-2481. TestFileChannelEncryption fails with System locale other than en_US

(Santiago M. Mola via Hari)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk