Merging with master
OPAL-2441: do not double encode queries for keypairs
Merge pull request #542 from emorency/OPAL-2427-test-db

OPAL-2441: Double-encoding of url solved for keypair.