CONTRIB-4994 fix upgrade for sites with large numbers of questions