Instead of doing a configuration line merge to remove configuration

values we don't included, followed by a call to concatenate additional
configuration values, do a single merge call including all of the
configuration values we care about.

This change is slightly more defensive -- if a user tries to change one
of the configuration values we don't allow, we'll strip it, rather than
failing the load.

Clean up memory handling a bit so we don't leak memory, someday Coverity
will thank me.

0 files changed, 0 insertions, 0 deletions