Fixes for fabric script for packaging
Merge branch 'master' of github.com:AIFDR/inasafe into aggregation