r23207: merge net help test fix from SAMBA_3_0_26