Packaging updates for 2.5.0 release