* Initial changes to make nexthop index as key instead of vrf

Change-Id: Idb6baad7cbd91b65d351ef9f76613485d45e5b56
Vmware Vrouter changes

Change-Id: I84d4a065ad5949641992cad55cae775964fa77ae
* Flow key changes to make nexthop as flow index, instead of vrf

Change-Id: I8445017b93812201054548bf982fec663a2b3ca7
Merge remote branch 'upstream/master' into aap_code

Conflicts:
	dp-core/vr_datapath.c