merge dev_4_4 -D org -I include -E exclude: PR 811 (Set version information in Maven)
merge dev_4_4 -D org -I include -E exclude: PR 815 (Minor import fixes (rebased onto dev_4_4))