Re-order headers after recent merge

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/fix-header-order into master

Created by: chuckatkins

Merge request reports