HashTree and ListedHashTree in the org.apache.jorphan.collections package fail to compile with Java 8 due to a conflict with the newly added Map.replace(K,V) method:

compile-jorphan:
    [javac] Compiling 55 source files to C:\dev\apache\jmeter\build\jorphan
    [javac] warning: [options] bootstrap class path not set in conjunction with -source 1.6
    [javac] C:\dev\apache\jmeter\src\jorphan\org\apache\jorphan\collections\HashTree.java:766: error: name clash: replace(Object,Object) in HashTree and replace(K,V) in Map have the same erasure, yet neither overrides the other
    [javac]     public void replace(Object currentKey, Object newKey) {
    [javac]                 ^
    [javac]   where K,V are type-variables:
    [javac]     K extends Object declared in interface Map
    [javac]     V extends Object declared in interface Map
    [javac] C:\dev\apache\jmeter\src\jorphan\org\apache\jorphan\collections\ListedHashTree.java:119: error: name clash: replace(Object,Object) in ListedHashTree and replace(K,V) in Map have the same erasure, yet neither overrides the other
    [javac]     public void replace(Object currentKey, Object newKey) {
    [javac]                 ^
    [javac]   where K,V are type-variables:
    [javac]     K extends Object declared in interface Map
    [javac]     V extends Object declared in interface Map
    [javac] Note: C:\dev\apache\jmeter\src\jorphan\org\apache\jorphan\gui\JLabeledChoice.java uses unchecked or unsafe operations.
    [javac] Note: Recompile with -Xlint:unchecked for details.
    [javac] 2 errors
    [javac] 1 warning