merge dev_5_0 -D org -I include -E exclude: PR 846 (Fix the copyright statement on generated Javadocs (rebased onto dev_5_0))