Merge "Fixup the memcached servers string in nova.conf for v6"