BISERVER-8103: Fixed duration logic.  Added initial code to handle complex triggers on ...

...add