Also pull in port improvements from glewis@ to enable customizing which Java that Unifi runs with PR: 240016