Six more Equals/HashCode/StringBuilder replacements

I'm intentionally breaking these up into small groups so they can
be reasonably reviewed, rather than one giant group that can't.
Contributes to fixing bug 20.

Fourth in set.

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