chore: consolidate changelog entries for 10.1

Author: chadlwilson

CHANGELOG.md

@@ -1,14 +1,13 @@
 ## 2.1.1 (UNRELEASED)
 
-- #623: fix: ensure compatibility with JRuby 10.1
+- #624, #635, #623: fix: ensure compatibility with JRuby 10.1
 - #583: fix: Create config dir if it's missing for simpler usage
 - #588: fix: NullPointerException during shutdown with executable war files
 - #589: fix: Jetty wars don't have console logging enabled by default
 - #617: fix: correct ability to configure/override/force specific traits via Config.new(forced_traits: [...])
 - #591: chore: clean up obsolete & deprecated code from 2.0.x and old Bundler versions
 - #592: chore: relax rubyzip requirement to allow rubyzip 2.x
 - #593: chore: relax jruby-rack requirement to allow compatibility with upcoming 1.3.x
-- #624: chore: remove use of deprecated JRuby methods removed in JRuby 10.1
 - #634: chore: deprecate JBundler trait for removal
 
 ## 2.1.0