Seven 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.

Fifth set.

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