merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 245 (Add note about Java UTF-8 source in Insight.)