merged master, fixed test helpers import path
merged master, fixed test helpers import path


Former-commit-id: afd17de20f2bce8f461f7912b7bc117312b61381 [formerly 3340ed605bfb3754bb28a09bf1651926e4e6f060]
Former-commit-id: 777dbe436e02be91c9b892e5e7a5980ca58e468d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine