Imported fixed pre-2.0 copied from the better-risk branch
Fixed a misprint
Renamed the command openquake->oq-engine
Fixed the packager
Fixed engine_test.py
Renamed a missing openquake->oq-engine
Merge pull request #1550 from gem/oq-engine-command

Renamed the command openquake->oq-engine
Merge pull request #1548 from gem/fix-event-based

Important fixes pre-2.0 copied from the better-risk branch
Fixed two merge errors
Merge pull request #1551 from gem/fixed-merge-errors

Fixed two merge errors
Merged from master