Merge pull request #1002 from akbargumbira/develop

Fix failing test on keyword wizard.
Merge pull request #1003 from akbargumbira/develop

Fix bad copy paste.
Fix #1004 Bug - OpenLayers Plugin - Add OpenStreetMap Layer
Merge pull request #1005 from timlinux/inasafe-1004

Fix #1004 Bug - OpenLayers Plugin - Add OpenStreetMap Layer
Move all tests in safe.common to safe.common.test