Merge branch '3.8-dev'

Author: andreachild

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/Tree.java

@@ -144,7 +144,7 @@ public String prettyPrint() {
         final StringBuilder builder = new StringBuilder();
         prettyPrint(builder, "");
         final String pretty = builder.toString();
-        return pretty.isEmpty() ? pretty : pretty.substring(0, pretty.length() - 1);
+        return pretty.isEmpty() ? pretty : pretty.substring(0, pretty.length() - System.lineSeparator().length());
     }
 
     private void prettyPrint(final StringBuilder builder, final String prefix) {

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java

@@ -821,7 +821,7 @@ private static <T> List<org.hamcrest.Matcher<? super T>> getMatchers(final T[] i
     public List<TreeNode> parseTree(final String asciiTree) {
         if (asciiTree.isEmpty()) return Collections.emptyList();
 
-        final List<String> lines = Arrays.asList(asciiTree.split(System.lineSeparator()));
+        final List<String> lines = Arrays.asList(asciiTree.split("\\R"));
 
         final List<TreeNode> roots = new ArrayList<>();
         final Map<Integer, TreeNode> levelMap = new HashMap<>();