Fix merge conflict within memcachedtest.xml

Signed-off-by: James Noss <james.noss@lexisnexis.com>