Fixes for two failing tests on Jenkins
Merge branch 'master' of github.com:AIFDR/inasafe into useNewZonal