Fixed a bug due to the version of mock used
Fixed also a bug in the PerformanceMonitor
Merge pull request #1133 from gem/fix-mock-issue

Fixed a bug in event_based/core_test.py due to the version of mock used