Yes, they are unrelated.  While I was running the test suite to verify the jar patches worked, these changes were made due to other failures, and I found the errors were not informative.  In the end, it turns out it was user error (my error) when running the build setup, but I had decided to leave these fixes in since it made the unit tests slightly more clear.