make a difference between insert and update when MVCC is used
Merge branch 'master' of https://github.com/ers-devs/ers-aggregator