Merge proposals dependent on lp://qastaging/~zomux/twistedchecker/make-epydoc-optional

lp://qastaging/~zomux/twistedchecker/make-epydoc-optional has no merge proposals.