Fix some issues with recent JiveXML updates to keep main and 24.0 in sync, assuming more developments may follow.
/cc @myexley