Revert "Merge remote-tracking branch 'origin/master' into hv/feat/DHI… #10407

Job	Run time
setup-matrix	3s
install	19s
unit-tests	31s
lint	1m 1s
flow	45s
build	1m 54s
instance-version	4s
cypress-dev (1, cypress/e2e/AllAccessibleRecordsPage/AllAccessibleRecordsPage.feature, cypress/e2...	9m 37s
cypress-dev (2, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventP...	16m 34s
cypress-dev (3, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageNavigation/EnrollmentAdd...	9m 2s
cypress-dev (4, cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feat...	11m 25s
cypress-dev (5, cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEve...	15m 51s
release	43s
	1h 7m 49s

Provide feedback