Changes needed to coexist with the non-parametric-source pull request in hazardlib: https://github.com/gem/oq-hazardlib/pull/142
Merged from master
Addressed the concerns in https://github.com/gem/oq-engine/pull/1359
Removed an unused utility assert_deep_equal
Merge branch 'non-parametric-source' of github.com:gem/oq-engine into non-parametric-source
Merge pull request #1359 from gem/non-parametric-source

Support for non-parametric sources