Encoding: Fix build error with Sun 5.9 compiler.
Merge topic 'encoding-ctest-fixes' into next

f2fbd3c4 Encoding: Fix build error with Sun 5.9 compiler.