Merge "Add whitelist entry for s-proxy 'Timeout talking to memcached'"