Dont reset CONFIG_ARGS as it might have been sourced from sysconfig/defaults.

This is also a partial fix for #1141.
Merge pull request #1166 from jmaas/master

Dont reset CONFIG_ARGS as it might have been sourced from sysconfig/defa...