Various updates/cleanups from review feedback

config/config-mp/src/test/java/io/helidon/config/mp/MpMetaConfigTest.java

@@ -60,21 +60,6 @@ void resetConfig() {
         }
     }
 
-    // @Test
-    void testMetaYaml() {
-        System.setProperty(MpMetaConfig.META_CONFIG_SYSTEM_PROPERTY, "custom-mp-meta-config.yaml");
-        config = ConfigProvider.getConfig();
-
-        // validate the config sources
-        Iterable<ConfigSource> configSources = config.getConfigSources();
-        List<String> sourceNames = new LinkedList<>();
-        configSources.forEach(it -> sourceNames.add(it.getName()));
-
-        assertThat(sourceNames, iterableWithSize(2));
-        assertThat(sourceNames.get(0), is("CLASSPATH"));
-        assertThat(config.getValue("value", String.class), is("classpath"));
-    }
-
     @Test
     void testMetaEnvironmentVariablesSystemProperties() {
         System.setProperty("property1", "value1");

config/hocon-mp/src/main/java/io/helidon/config/hocon/mp/HoconMpConfigIncluder.java

@@ -122,11 +122,11 @@ void relativePath(Path relativePath) {
      * @param what file name
      * @return file name with extension
      */
-    public static String patchName(String what) {
-        java.util.Optional<String> base = java.util.Optional.of(what)
+    private static String patchName(String what) {
+        Optional<String> base = Optional.of(what)
                 .filter(f -> f.contains(File.separator))
                 .map(f -> f.substring(f.lastIndexOf(File.separator) + 1));
-        java.util.Optional<String> ext = Optional.of(base.orElse(what))
+        Optional<String> ext = Optional.of(base.orElse(what))
                 .filter(f -> f.contains("."))
                 .map(f -> f.substring(f.lastIndexOf(".") + 1));
         return ext.isPresent() ? what : what + HOCON_EXTENSION;