Merge "Vendorsetup needs to look in additional places."