Check with @rafabene whether this is fine. We currently use 2.4.0-build-5 in master branch, and 2.4.0-redhat-2 in the 2.4.x branch.

This will apply cleanly against the 2.4.x branch which is what you'd want for 2.4.