fixed full run test
Merge branch 'dock_refactor' of github.com:AIFDR/inasafe into dock_refactor