Cherry picking to remove some pylint issues
Cherry picking to remove some pylint issues


Former-commit-id: ef705a2ae97de03df3cfc1903ecd2fe5784b1627 [formerly 9a4e1d34d8a84a68c046927c36b491b4b3b5af21]
Former-commit-id: d063eaa8e646d4344d1cc3ab02136fa7457e05ca
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine