Fixing more tests and updated data hash
Merge branch 'dock_refactor' of github.com:AIFDR/inasafe into dock_refactor
Merge remote-tracking branch 'origin/dock_refactor' into automatic_gui_testing