Towards gw network on vxlan.

Change-Id: Ic0f2b106eb67676140559c00a47079dd69b92627
Small bug fixes.

Change-Id: Ib48cf27374ec27bb40fbbffccb5b03f6300667c2