first round of import fixes
first round of import fixes


Former-commit-id: 798b59adc2240251eca59f2733f16bb2270da271 [formerly 3fdf43066327ea607426c1ecdfbc420009f217a4]
Former-commit-id: fe6279e3dfefb6febc5c0d2d2b5f220e8660c05e
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine