Merge "Remove 'reseller' config option"