[1.6.x] Fixed #22250 -- regression in gis compiler for non-concrete fields

Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e66e from master
[1.6.x] Fixed #21858 -- Clarified 1.6 release note regarding M2M help text changes.

Thanks lee at semel.net for the report.

Backport of f30e6590f4 from master