Merge vmware-dev branch.

Merged following commits
1 : 48d5fec322cd3feb71403d9c391211a1c65ae284,
    Support for src-mac based vm-port assignment
2 : 1dabbc0e7bf031de50b1d988f3ebbc4ba9624d94 and
    Fix merge issues
3 : c02c0c72dde35b51fba5a88f440af4b71e2a4d6e
    Additional changes to Agent for Contrail to work with VMWare vCenter.

Change-Id: I41058106869c4e552ccb5ef1ec0591a40bb08c79