Merge branch 'main' into BAH-2962

# Conflicts:
#	.gitignore
#	api/src/main/java/org/bahmni/module/events/api/configuration/JMSEventPublisherConfiguration.java
#	api/src/main/java/org/bahmni/module/events/api/listener/PatientAdvice.java
#	api/src/main/java/org/bahmni/module/events/api/model/BahmniEventType.java
#	api/src/main/java/org/bahmni/module/events/api/publisher/EventPublisher.java
#	api/src/test/java/org/bahmni/module/events/api/listener/PatientAdviceTest.java
#	api/src/test/java/org/bahmni/module/events/api/publisher/EventPublisherTest.java
#	omod/src/main/resources/config.xml