Merge branch 'file-parsing-fix' of https://github.com/larsbutler/oq-engine
Merge branch 'master' of http://github.com/gem/oq-engine
Added a tests checking that setval is called correctly
Fixed the args parsing for the script restore_hazards
Merge pull request #1251 from gem/restore_hazards_args_parsing

Small fixes to the script restore_hazards.py