This patch adds a new vendor/product strings for netapp E series  product.
Also consolidated the strings together with similar names.
Signed-off-by: Babu Moger <babu.moger@netapp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>