BISERVER-8101 - Added the functionality for determining event logic and ...

...conflicts