Removed explicit default value from two config items.
Merge pull request #299 from joakim-hove/cherry-pick-PR296

Removed explicit default value from two config items.