Fix various tests on develop on Ubuntu 14.04
Merge pull request #926 from akbargumbira/develop

Fix various tests on develop on Ubuntu 14.04
[#903] Fix #903
Merge pull request #927 from akbargumbira/inasafe-903

Fix #903