Merge "Replace deprecated nova_metadata_ip"