Reverting unnecessary ConEmu.xml changes to master.