This restores ruamel's new line-wrapping behavior, but corrects the trailing spaces that it leaves by stripping them in our customized output routine. Change-Id: I795994657abb3d706c2a0725c5955e15e5c067ba