remove default=None for config options

In the cfg module default=None is set as the default value.

Change-Id: I235decf26827bcb8076867f63c005ce5a80554fa
Merge "remove default=None for config options"