Reindent Esterwegen test XMLs, remove merge conflict lines from .properties file