(2.7x) backport r13887 to fix bug #5260 in the 2.7x branch
(daemon) #5260 'conflicting documentation for -w argument': fixed.