Missed some more merge conflicts
Missed some more merge conflicts


Former-commit-id: 43b7e40856d114b16cd3b2d7d1fa6d0e03ce9f12 [formerly 981822301788e150e1bc1f0b642ad92fda5a9205]
Former-commit-id: 730638dd1599ad9e7490ed29011461cccd74442e
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine