Cleanup of stout headers from fedora review.

From: Timothy St. Clair <tstclair@redhat.com>
Review: https://reviews.apache.org/r/16830