Merge "Revert "memcached: better error messaging""