BK-843 Some event names still have Bootstrap 2 names
Merge remote-tracking branch 'sfdev/2.0' into 2.0
BK-787 Refactoring to allow notifications propagation during import