ATLAS-3674: fixed build errors caused by earlier cherry-pick
1 file changed