Merge "perfprofd: fix test PerfProfdTest.ConfigFileParsing."