Initially we included user-specific settings last, so that they
could turn off or replace system settings... otherwise we only get
to change what's NOT explicitly set by the system.  This is overly
constraining.

Restore the original functionality of allowing the user to
override settings defined by the distribution's configuration.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>