Merge "Fix bogus calls to encodeKey/decodeKey in the PHP memcached class"