more 1.5 java ci build fixes.