Bug 2103: Fix hash collisions preventing some switches from registering

Change-Id: I3131f80ebd2c6731febd600d3701f1de2bd23cd8
Signed-off-by: Ed Warnicke <eaw@cisco.com>