[ros-diffs] [cgutman] 47950: [QMGR] - Reapply r47268 to fix DHCP