Don't use openjdk7* binaries at all.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Provided additional patch for Makefile.test of Openjdk.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>