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 --cc 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
@@@ -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