Affiliation to Nicira is changed to VMware

Closes bug 1212949

Change-Id: I611cd08920c0654fea3177f6e9256030afb05d7d
Merge "Affiliation to Nicira is changed to VMware"