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.
Eleventh set.
Change-Id: I45b20ae7c5d285598a1e1a0bfa9fbbfa7c1b617a Signed-off-by: Ed Warnicke <eaw@cisco.com>