More work [skip hazardlib]
More work [skip hazardlib]


Former-commit-id: 09d84dbba79370cf8de2cddb3ac5a5efa12fe9e2 [formerly 0ead90b3e4cb15e7ae639607b3690e58e074b9cc]
Former-commit-id: 3999682026f46f1dbae6e77e360289df24ce1dbf
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine