Merge "Set proper ownership for the Heka configuration"