minor cleanings
update engine tests to the new api of BaseCalculator
Merge branch 'master' of https://github.com/gem/oq-engine into engine-test-fix
Merge pull request #1315 from matley/engine-test-fix

Engine Unit test fix