[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4921: Merge NRHM Report module from 2.3 to trunk