Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...

diff --combined build.gradle
index ed0182d,07c9476..147c2ef
--- 1/build.gradle
--- 2/build.gradle
+++ b/build.gradle
@@@ -1284,6 -1284,11 +1284,11 @@@ test 
      println("Setting Test LaF to '${testLaf}'")
      systemProperty "laf", testLaf
    }
+   def testHiDPIScale = project.findProperty("test_HiDPIScale")
+   if (testHiDPIScale != null) {
+     println("Setting Test HiDPI Scale to '${testHiDPIScale}'")
+     systemProperty "sun.java2d.uiScale", testHiDPIScale
+   }
    sourceCompatibility = compile_source_compatibility
    targetCompatibility = compile_target_compatibility
    jvmArgs += additional_compiler_args
@@@ -1358,8 -1363,8 +1363,8 @@@ jar 
      "Implementation-Version": JALVIEW_VERSION
    }
  
 -  def distDir = "${jalviewDir}/${package_dir}"
 -  destinationDirectory = file(distDir)
 +  def outputDir = "${jalviewDir}/${package_dir}"
 +  destinationDirectory = file(outputDir)
    archiveFileName = rootProject.name+".jar"
  
    exclude "cache*/**"
@@@ -1372,7 -1377,7 +1377,7 @@@
    sourceSets.main.resources.srcDirs.each{ dir ->
      inputs.dir(dir)
    }
 -  outputs.file("${distDir}/${archiveFileName}")
 +  outputs.file("${outputDir}/${archiveFileName}")
  }