Merge "config.xml: Add config flag for filtering DBS scans" into pi-dev am: cd8d257d42
am: 607a78db5f

Change-Id: I23137675eaa8176246d06faf28ef84d6cd15162a