KAFKA-2526: command line --producer-property wins

Author: jkt628

Diff for: core/src/main/scala/kafka/tools/ConsoleProducer.scala

@@ -134,8 +134,6 @@ object ConsoleProducer extends Logging {
         Utils.loadProps(config.options.valueOf(config.producerConfigOpt))
       else new Properties
 
-    props ++= config.extraProducerProps
-
     if (config.bootstrapServer != null)
       props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, config.bootstrapServer)
     else
@@ -171,6 +169,7 @@ object ConsoleProducer extends Logging {
     CommandLineUtils.maybeMergeOptions(
       props, ProducerConfig.MAX_BLOCK_MS_CONFIG, config.options, config.maxBlockMsOpt)
 
+    props ++= config.extraProducerProps
     props
   }