* Rename SpanScopePair to SpanWithScope
* Add closeScope() method and remove getScope()
* Rename spanAndScope parameters to spanWithScope
* A few more renames
* Fix sporadic test failure
* Remove RetryOnFailure from Elasticsearch tests
* Remove retry from Hystrix tests
* Improve test verification
* Fix sporadic span order not found failures
* Add RetryOnFailure to tests with sporadic failures
* Move things up a directory
* Scripted mass update
find -type f -name "*.gradle" | xargs sed -i 's/:java-agent:/:/g'
* Remove plugin version now that it's in root module
* Update java-agent and instrumentation configs
* Misc