Fix test characterisation for windows.
Fix broken help handling under windows.
Merge branch 'master' into inasafe_qgis2
fix some pylint violations