Revert "Merge pull request #2 from Zentyal/jgarcia/fix-encoding-of-mapistoreuris"

This reverts commit 876a9c7db0d74ba6ef6bd32cf818186b7f44d7d9, reversing
changes made to 800078920c168c9324dca2f002dc8ad440ad4bc4.
Merge branch 'master' into precise-cloud