Merge pull request #1570 from gem/db-migrations

Changed the import of the calc module
Merge branch 'master' into oq-lite
Reflected a small change of API in commonlib.parallel.PerformanceMonitor