first changes for openjdk update and fix
the port patches need those moved
less bashing :P