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

Change-Id: Ic47ded2705c49ab4a956763d07d92f557a550455