Fixes for failing tests on jenkins
Merge branch 'master' of https://github.com/AIFDR/inasafe into data_driven_age