Merge pull request #17019 from slavapestov/never-fixes-4.2

Fix various bogus unreachable code warnings [4.2]