Merge branch '25-from-2.15.1' into 28
make constants only optionally be read-only, other cleanup of constant objects
re-enable read-only constant objects (keep option to disable)
Merge branch '28-const-optional' into 29