Add WMS servers
Revert fix for #330 and fix tests
Merge pull request #840 from geoadmin/fix_812

Add  WMS servers