Merge changes I85bfb755,Icacedb46

* changes:
  Prepare upstream tools for 9+181 integration.
  Upstream tooling: Fix java{,x}.sql missing from 'expected' snapshot.