[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1997: Fixed Bugs to run India Reports and Dashboard Modules