SHINDIG-207 Patch from Ian Boston which simplifies our java build process. See the bug for a full set of details.