Fixed the XML export of gmf_scenario and added a schema-consistency check in the tests
Merged from master
Fixed an ordering bug in pg_importer_test.py
Fixed a bug due to the version of mock used
Restored the accidentally removed check_export functionality in export/hazard_test.py
Fixed also a bug in the PerformanceMonitor
Fixed the export of UHS files
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
Merge branch 'master' of github.com:gem/oq-engine into 1167324
Merge branch 'master' of github.com:gem/oq-engine into event-base-performance
Merge pull request #1132 from gem/1167324

Make sure the generated XML are valid according to NRML
Merge branch 'master' of github.com:gem/oq-engine into event-base-performance
Small refactoring