Avoided circular import
Avoided circular import


Former-commit-id: 18dd06b4fcaab5aaa93c9dc45c9b2d55e12e6b24 [formerly db7166f70f27bea62d7cb636ace89f76f25e437c]
Former-commit-id: dc9f02b062df67ddd57a715a8c3b50d7ed445dde
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine