Fixed broken PatientUtilsFragmentControllerTest.flags unit test
Tb Follow up
* Re Introduction of Tb follow up form
* Making adjustments in the xml document