http://cr.opensolaris.org/~mjnelson/webrev.456.457/
I updated the rtichk.py test, too; a couple of the existing tests seemed (to me) to be incorrect. For the off-SWAN check, I instrumented DbLookups.py to always throw RtiOffSwan, and called rti with multiple bugids. For the consolidation specified but gate path not specified, I added another test to rtichk.py. If those conditions provide insufficient scoping, such that multiple lines are returned, then this will still fail with invalid output. I ended up filing three new rfes to track stuff that I'm not fixing with this wad: 494, 495, and 496. --Mark