expose some @Override annotations (rebased from dev_5_0)

Check that the code changes look sane and that all the jobs remain green.

--rebased-from #2704