New update from upstream
    
    - Fixes for previous patches incorporated there
    - roman.py has been moved into a docutils submodule
    - docutils doesn't work with PyXML.  before I poke around for the bug in PyXML,
      seeing if we're going to go through with deprecating it or if we can sanitize
      our python stdlib's handling of it.
    - Fix for traceback in https://bugzilla.redhat.com/show_bug.cgi?id=786867