Merge changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd

* changes:
  Fix checkstyle warnings in netconf-cli
  Fix checkstyle warnings ietf-netconf-monitoring
  Fix checkstyle warnings for netconf-testtool
  Fix checkstyle warnings for config-netconf-connector

diff --combined opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
index 99f9c04fcc91d32c60640f0878ab289a6961358f,d544d1fb3394c6e114a1b4cb398e9786e5332a93..faaa17d5280f289ed6a004fd1f6df95165a02eda
--- 1/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
--- 2/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java
@@@ -8,6 -8,10 +8,10 @@@
  
  package org.opendaylight.controller.netconf.confignetconfconnector.osgi;
  
+ import static com.google.common.base.Preconditions.checkState;
+ 
+ import java.util.Dictionary;
+ import java.util.Hashtable;
  import org.opendaylight.controller.netconf.mapping.api.NetconfOperationServiceFactory;
  import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
  import org.osgi.framework.BundleActivator;
@@@ -19,17 -23,12 +23,12 @@@ import org.osgi.util.tracker.ServiceTra
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import java.util.Dictionary;
- import java.util.Hashtable;
- 
- import static com.google.common.base.Preconditions.checkState;
- 
  public class Activator implements BundleActivator {
  
-     private static final Logger logger = LoggerFactory.getLogger(Activator.class);
+     private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
  
      private BundleContext context;
 -    private ServiceRegistration osgiRegistration;
 +    private ServiceRegistration<?> osgiRegistration;
      private ConfigRegistryLookupThread configRegistryLookup = null;
  
      @Override
@@@ -39,7 -38,7 +38,7 @@@
          ServiceTrackerCustomizer<SchemaContextProvider, ConfigRegistryLookupThread> customizer = new ServiceTrackerCustomizer<SchemaContextProvider, ConfigRegistryLookupThread>() {
              @Override
              public ConfigRegistryLookupThread addingService(ServiceReference<SchemaContextProvider> reference) {
-                 logger.debug("Got addingService(SchemaContextProvider) event, starting ConfigRegistryLookupThread");
+                 LOG.debug("Got addingService(SchemaContextProvider) event, starting ConfigRegistryLookupThread");
                  checkState(configRegistryLookup == null, "More than one onYangStoreAdded received");
  
                  SchemaContextProvider schemaContextProvider = reference.getBundle().getBundleContext().getService(reference);
@@@ -52,7 -51,7 +51,7 @@@
  
              @Override
              public void modifiedService(ServiceReference<SchemaContextProvider> reference, ConfigRegistryLookupThread configRegistryLookup) {
-                 logger.debug("Got modifiedService(SchemaContextProvider) event");
+                 LOG.debug("Got modifiedService(SchemaContextProvider) event");
                  configRegistryLookup.yangStoreService.refresh();
  
              }
@@@ -90,7 -89,7 +89,7 @@@
          @Override
          public void run() {
              NetconfOperationServiceFactoryImpl factory = new NetconfOperationServiceFactoryImpl(yangStoreService);
-             logger.debug("Registering into OSGi");
+             LOG.debug("Registering into OSGi");
              Dictionary<String, String> properties = new Hashtable<>();
              properties.put("name", "config-netconf-connector");
              osgiRegistration = context.registerService(NetconfOperationServiceFactory.class, factory, properties);