Merge branch '2.1'

Author: ctubbsii

core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java

@@ -27,7 +27,6 @@
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
 
 import java.lang.Thread.UncaughtExceptionHandler;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -206,9 +205,7 @@ public String getGroup() {
         }
       });
       return scanServerSelector;
-    } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
-        | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
-        | SecurityException e) {
+    } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
       throw new RuntimeException("Error creating ScanServerSelector implementation: " + clazz, e);
     }
   }

server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java

@@ -20,7 +20,6 @@
 
 import static org.apache.hadoop.util.StringUtils.getTrimmedStrings;
 
-import java.lang.reflect.InvocationTargetException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -248,8 +247,7 @@ public DistributionStatisticConfig configure(Meter.Id id,
             registry.config().commonTags(commonTags.values());
             registry.config().meterFilter(replicationFilter);
             addRegistry(registry);
-          } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException
-              | InstantiationException | IllegalAccessException ex) {
+          } catch (ReflectiveOperationException ex) {
             LOG.warn("Could not load registry {}", factoryName, ex);
           }
         }
@@ -269,8 +267,7 @@ public DistributionStatisticConfig configure(Meter.Id id,
 
   @VisibleForTesting
   static MeterRegistry getRegistryFromFactory(final String factoryName, final ServerContext context)
-      throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
-      InstantiationException, IllegalAccessException {
+      throws ReflectiveOperationException {
     try {
       LOG.info("look for meter spi registry factory {}", factoryName);
       Class<? extends MeterRegistryFactory> clazz =