This change allows DatabaseCampaign users to take advantage of the improved variant selection methods in the Database class (multiple uses of --variant/--benchmark possible, plus --exclude-variant/--exclude-benchmark switches). Change-Id: Idb1ca04538ff7601b3648cd9ba766aa8690fff6b