Merge "Use Configuration#unset() instead of #setToDefaults() for clearing"