4713.   [cleanup]       Minor revisions to RPZ code to reduce
                        differences with the development branch. [RT #46037]

9.11.3, 9.10.7, 9.9.12-S1