Fixes to make existing L3 unit tests pass.

Change-Id: I8da9ad863e8628a8d7eff2d332d5c616677e66fc
Merge branch 'csr1kv_for_routing' of github.com:CiscoSystems/quantum into bp/csr1kv_for_routing