Nicira should be replaced with VMware

Change-Id: I1d50e8fd689ac5a6b050bec55b4c4ffe95bdd295