BISERVER-8101 - Added complex implementations of IBlockOutTrigger, while also handling them in the DefaultBlockOutManager implementation
BISERVER-8101 - Merge of recent conflicts with BlockOutTriggers
Merge pull request #273 from krivera-pentaho/dev

BISERVER-8101 -- Added changes to implementation of DefaultBlockoutManager to handle complex IBlockoutTriggers