Fixes for test_type_edit form
Merge branch '2.5_KENYA_DEV' of 204.232.175.90:ilabafrica/BLIS into 2.5_KENYA_DEV