MERGE: Extensions and header branches

[carlwilson]

• resolved conflict around duplicate message IDs.

Integration merge for #736 submitted by @samalloing thanks.

[carlwilson]

@samalloing a quick review of my conflict resolution wouldn't go amiss if possible? Thanks.

[codecov[bot]]

Codecov Report

Merging #741 (8601f08) into integration (113d2e4) will not change coverage. The diff coverage is n/a.

@@              Coverage Diff               @@
##             integration     #741   +/-   ##
==============================================
  Coverage          46.35%   46.35%           
  Complexity          1053     1053           
==============================================
  Files                 57       57           
  Lines               9073     9073           
  Branches            1609     1609           
==============================================
  Hits                4206     4206           
  Misses              4329     4329           
  Partials             538      538           

---

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 767fb65...8601f08. Read the comment docs.

[samalloing]

Hi @carlwilson

It seems fine to me. Just a small remark

MessageConstants.PDF_HUL_155); // PDF-HUL-154

should be

MessageConstants.PDF_HUL_155); // PDF-HUL-155

Sam

[carlwilson]

Nice catch @samalloing this is JUST in time to make the RC build now. Should be out very shortly.