Small changes to accomodate the an import change in nrmllib
Small changes to accomodate the an import change in nrmllib


Former-commit-id: f56fb23a1d4f3dc95710e13dcd452bc790392f0a [formerly ffc25011895195fe706ff2751f7b771cb2b1852d] [formerly ffc25011895195fe706ff2751f7b771cb2b1852d [formerly 9957f8f41cf0b75a965267ab05e33fbb8ff8a0a8]]
Former-commit-id: 4d242594a2434c74ed62e5b44b81a9d09101e986
Former-commit-id: 17ee481fc6f203e568d5b199d6c59dae9f0f35ae
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine