r22175: sync packaging changes from SAMBA_3_0_25