Java client snapshot

This PR contains those compilation changes needed to bring the Java Client snapshot up to a current version.

Once I submit this PR I will deploy said snapshot.  Things will not build.  Once the project has been updated and cleaned, gradle will fetch the new snapshot and things will once again work.