am d83d6606: Merge change 4106 into donut

Merge commit 'd83d6606d62e27effc27be48d6050914deefe9eb'

* commit 'd83d6606d62e27effc27be48d6050914deefe9eb':
  Adjust order of file/section list in output diff