[options] allow variant option names in config file
[plugins] Set default predicate instead of None
[MigrationResults] collect info about conversions

[gluster] collect public keys from the right dir
[cleaner] Only skip packaging-based files for the IP parse
[networking] collect also tc filter show ingress
[archive] skip copying SELinux context for /proc and /sys
[sssd] sssd plugin when sssd-common
Various OCP/cluster/cleanup enhancements

Load maps from all archives before obfuscation
Multiple fixes in man pages
[ds] Mask password and encryption keys in ldif files
[report] add --cmd-timeout option
[cups] Add gathering cups-browsed logs
[sssd] Collect memory cache / individual logfiles
Collect ibmvNIC dynamic_debugs
[pulpcore] add plugin for pulp-3
[saphana] remove redundant unused argument of get_inst_info
[networking] Add nstat command support
[snapper] add a new plugin

Rebase on upstream 4.1

Automatically create directory for sos-cleaner default_mapping

[kdump] Gather the file kexec-dmesg.log
[Policy] Handle additional FTP authentication issues

[networking] Collect 'ethtool -e <device>' conditionally only

[component] honour plugopts from config file
[collector] declare sysroot for each component
[plugins] Dont stop collecting by empty specfile when sizelimit=0

[component] Use sysroot from Policy when opts doesn't specify it

[ovirt] collect /etc/pki/ovirt-engine/.truststore
[collector] allow overriding plain --cluster-type
[component] Add log verbosity from presets
[options] Fix --log-size=0 being ignored and unreported
[report] collect broken symlinks

[cleaner] more streamlined sanitize_item method
[openstack_ironic] Missing ironic-inspector configs
Add support to collect hardware component logs
[crio] collect /etc/crio/crio.conf.d/
[policy] Handle additional failure conditions for FTP uploads
[filesys] never collect content of /proc/fs/panfs
[kdump] Collect new kdump logfiles
[stratis] Collect key list and report engine
return tmp-dir with absolute path

Rebase on upstream 4.0