Add jar that should have been added as part of 69c61d0
Preserve JVM args when auto-configuring a Java agent in Gradle bootRun

Fixes #1411
Merge branch '1.1.x'