Merge "Fix turbine classpath arguments" am: 759a577961
am: 1984c6c3b8

Change-Id: I25a3d598cf16b0cebbf035b4d14aab2e52aed99c