Fix places where bottle block was inserted incorrectly
libmemcached: adjust patch based on upstream comments

Closes #35113.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
libmemcached: update 1.0.18_1 bottle.