moved the api.token_name, api.sandbox_* default after the api_settings-Filter
Merge remote-tracking branch 'origin/master'