merge dev_4_4 -D org -I include -E exclude: PR 673 (Make configuration file suffix configurable)
merge dev_4_4 -D org -I include -E exclude: PR 710 (Data test updates (rebased onto dev_4_4))