went through some pre-merge rebasing for cleaner diffs
Currently we already have a downflow from trunk/1.18 to 1.19.x to 1.20 , and all changes can be merged and released downstream but 1.16 was out of sync.
This will resolve the feature parity with features exclusive to 1.16 only and bring those down. as well as resolving all conflicts for future commits to flow
went through some pre-merge rebasing for cleaner diffs
Currently we already have a downflow from trunk/1.18 to 1.19.x to 1.20 , and all changes can be merged and released downstream but 1.16 was out of sync.
This will resolve the feature parity with features exclusive to 1.16 only and bring those down. as well as resolving all conflicts for future commits to flow