Fix #3967 Merge of Prediction Context arrays was broken#4180

parrt merged 2 commits intoantlr:devantlr/antlr4:devfrom

jimidle:feature/3967jimidle/antlr4:feature/3967Copy head branch name to clipboard