Merge branch '21-misc-cleanup' into 23
Merge branch '21-scalars' into 23
use LibExtern for constants, make R_UnboundValue a const
Merge branch '23-more-constants' into 25-from-2.15.1