[MJAVADOC-355] Encoding problem if platform encoding used to run Maven is different from default platform encoding. revert r1720609 and r1720589