Fixing broken tests (joyent and openstack)
[fix minor] Dont send empty query string options.
Merge branch 'master' into openstackIdentity