[krbdev.mit.edu #7447] Fix warnings in doc build

[Benjamin Kaduk via RT]

I'll also put a few fixes that I found while working on this ticket in the same ticket.
Some commits had needed changes that were preempted by other commits to the main repo, 
etc..