Fix compilation errors in TestSecondaryNameNodeUpgrade