Merge "Revert "Add neutron metadata for memcache security strategy""