Cherry-picked rpcdaemon changes for V4.2.1rc