Add 17.10 Drop 1: display well formatted xml