fixing bug #4493
subscribers of taxonomy are no more immediately notified when new contribution is created
Fix the conflict coming from the correction of the bug #4372
Fix the conflict coming from the correction of the bug #4497
Fix the conflict coming from the correction of the bug #4499