Merge branch 'cgfrost-master'
Revert "Upgrade the Java Client"

This reverts commit 3e57d171b87392ae13c9cbd7f2fad94e5b2e06a4.
Submodule updated
Submodule updated
Submodule updated