More fixes for building on Travis.  Hopefully Java will get generated and compiled correctly now.
Integrating changes from the remote