This patch series fixes the bug that "%unset" can't unset values defined in the other files read in previously. Renmaing test script in patch #1 is needed to centralize tests around configuration handling before adding the test about "%unset" bug fix in patch #2.