[FLINK-2990] Fix Flink on YARN for Scala 2.11

flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java

@@ -374,7 +374,7 @@ public class FlinkYarnSessionCli {
 		getYARNSessionCLIOptions(options);
 
 		CommandLineParser parser = new PosixParser();
-		CommandLine cmd = null;
+		CommandLine cmd;
 		try {
 			cmd = parser.parse(options, args);
 		} catch(Exception e) {

flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnClientBase.java

@@ -256,7 +256,7 @@ public abstract class FlinkYarnClientBase extends AbstractFlinkYarnClient {
 		for(File shipFile: shipFiles) {
 			// remove uberjar from ship list (by default everything in the lib/ folder is added to
 			// the list of files to ship, but we handle the uberjar separately.
-			if(!(shipFile.getName().startsWith("flink-dist-") && shipFile.getName().endsWith("jar"))) {
+			if(!(shipFile.getName().startsWith("flink-dist") && shipFile.getName().endsWith("jar"))) {
 				this.shipFiles.add(shipFile);
 			}
 		}