s3-waf: Use a common subsystem for samba-popt code