A lot of weird things happened in BXMSDOC-1320 and BXMSDOC-1321, in addition to an issue with an update by Marek to the GSG long ago that prevented it from being merged properly to 7.3.x (now 7.4.x). I have compared the GSG contents as well as all shared files between master and 7.4.x in meld and have identified a few mismatched contents. This JIRA is to make the update in the 7.4.x GSG only so that it's consistent with what's in master.

I'm using this manual approach rather than just rebasing the branch against the master version in order to avoid accidental replacements of things intended to be different. And I could rebase the branch topics individually, but that is just as manual of a process. The changes are few and distinct, so making the manual update seems best here.