modufy the logic for the split report to have indicators specific for
each program NCD and HIV
Merge branch 'master' of https://github.com/PIH/openmrs-module-rwandareports.git