Fix for mock in unit tests.

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