Move backported JUnit file to third_party (part 2)

Last commit did not pick up all the changes because MOE incorrectly attributed some changes to the wrong commit. This commit should reconcile these. Also picked up some changes to how hamcrest library is depended upon in BUILD file, which should have been included in previous commits.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177637931

java/google/registry/backup/BUILD

@@ -16,7 +16,7 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_appengine_tools_appengine_mapreduce",

java/google/registry/batch/BUILD

@@ -21,7 +21,7 @@ java_library(
         "//java/google/registry/request:modules",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_gcs_client",

java/google/registry/cron/BUILD

@@ -12,7 +12,7 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/dns/BUILD

@@ -28,7 +28,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/request/lock",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",

java/google/registry/export/BUILD

@@ -19,7 +19,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/storage/drive",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_apis_google_api_services_drive",

java/google/registry/export/sheet/BUILD

@@ -14,7 +14,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/request/lock",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_sheets",
         "@com_google_appengine_api_1_0_sdk",

java/google/registry/flows/BUILD

@@ -35,7 +35,7 @@ java_library(
         "//java/google/registry/tmch",
         "//java/google/registry/util",
         "//java/google/registry/xml",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",

java/google/registry/keyring/kms/BUILD

@@ -12,7 +12,7 @@ java_library(
         "//java/google/registry/keyring/api",
         "//java/google/registry/model",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_cloudkms",
         "@com_google_auto_value",

java/google/registry/loadtest/BUILD

@@ -14,7 +14,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/security",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_dagger",
         "@com_google_guava",

java/google/registry/mapreduce/BUILD

@@ -12,7 +12,7 @@ java_library(
         "//java/google/registry/model",
         "//java/google/registry/request",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_appengine_tools_appengine_pipeline",

java/google/registry/mapreduce/inputs/BUILD

@@ -10,7 +10,7 @@ java_library(
     deps = [
         "//java/google/registry/model",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_appengine_tools_appengine_pipeline",

java/google/registry/model/BUILD

@@ -17,7 +17,7 @@ java_library(
         "//java/google/registry/monitoring/metrics",
         "//java/google/registry/util",
         "//java/google/registry/xml",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",

java/google/registry/monitoring/whitebox/BUILD

@@ -16,7 +16,7 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",
         "@com_google_apis_google_api_services_monitoring",

java/google/registry/pricing/BUILD

@@ -10,7 +10,7 @@ java_library(
     deps = [
         "//java/google/registry/model",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",
         "@com_google_guava",

java/google/registry/rdap/BUILD

@@ -16,7 +16,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/ui/server/registrar",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/rde/BUILD

@@ -21,8 +21,8 @@ java_library(
         "//java/google/registry/util",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
-        "//third_party/java/jsch/v0_1_53",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/jsch/v0_1_53",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_appengine_tools_appengine_mapreduce",

java/google/registry/rde/imports/BUILD

@@ -20,7 +20,7 @@ java_library(
         "//java/google/registry/util",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_appengine_tools_appengine_mapreduce",

java/google/registry/security/BUILD

@@ -13,7 +13,7 @@ java_library(
     deps = [
         "//java/google/registry/model",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",

java/google/registry/tldconfig/idn/BUILD

@@ -10,7 +10,7 @@ java_library(
     resources = glob(["*.txt"]),
     deps = [
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",
         "@com_google_re2j",

java/google/registry/tmch/BUILD

@@ -20,7 +20,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
         "//java/google/registry/xml",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/tools/BUILD

@@ -65,7 +65,7 @@ java_library(
         "//java/google/registry/whois",
         "//java/google/registry/xjc",
         "//java/google/registry/xml",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_beust_jcommander",
         "@com_google_api_client",
         "@com_google_apis_google_api_services_bigquery",

java/google/registry/tools/server/BUILD

@@ -20,7 +20,7 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_beust_jcommander",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_gcs_client",

java/google/registry/ui/server/registrar/BUILD

@@ -25,7 +25,7 @@ java_library(
         "//java/google/registry/ui/soy:soy_java_wrappers",
         "//java/google/registry/ui/soy/registrar:soy_java_wrappers",
         "//java/google/registry/util",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_braintreepayments_gateway_braintree_java",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",

java/google/registry/util/BUILD

@@ -8,7 +8,7 @@ java_library(
     name = "util",
     srcs = glob(["*.java"]),
     deps = [
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_code_findbugs_jsr305",
         "@com_google_dagger",

java/google/registry/whois/BUILD

@@ -15,7 +15,7 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
         "//java/google/registry/xml",
-        "//third_party/java/objectify:objectify-v4_1",
+        "//third_party/objectify:objectify-v4_1",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_auto_value",
         "@com_google_code_findbugs_jsr305",