merge conflicts for merge from 1.6.x into master
merge conflicts for merge from 1.6.x into master

maduhu/head,vorburger/mifos-head,AArhin/head,maduhu/head,vorburger/mifos-head,maduhu/mifos-head,AArhin/head,vorburger/mifos-head,AArhin/head,AArhin/head,jpodeszwik/mifos,maduhu/head,AArhin/head,maduhu/mifos-head,vorburger/mifos-head,maduhu/mifos-head,jpodeszwik/mifos,jpodeszwik/mifos,maduhu/mifos-head,maduhu/mifos-head,maduhu/head,maduhu/head,jpodeszwik/mifos