fix upgrade test failures

The problem is in set up code on upgrade testing. There is no change to
production code.
[BZ 1108095] fix compiler errors