Registry path for jvm.dll is set to client instead of server

FULL PRODUCT VERSION :
java version "1.8.0_40"
Java(TM) SE Runtime Environment (build 1.8.0_40-b25)
Java HotSpot(TM) Client VM (build 25.40-b25, mixed mode)

ADDITIONAL OS VERSION INFORMATION :
Windows 8.1 Pro

EXTRA RELEVANT SYSTEM CONFIGURATION :
I have many installed Java 1.6 32bit, 1.6 64bit, 1.7 32bit, 1.7 64bit, 1.8 32bit and 1.8 64bit on my machine (for testing purposes), though this exactly the same thing didnt happen only to me but also to a person who had also installed 32bit Java aside beforehand

A DESCRIPTION OF THE PROBLEM :
https://bugs.openjdk.java.net/browse/JDK-8037565 the registry entry RuntimeLib for 64bit Java is set to C:\Program Files\Java\jre7\bin\client\jvm.dll instead of C:\Program Files\Java\jre7\bin\server\jvm.dll

C:\Program Files\Java\jre7\bin\client\jvm.dll doesn't exist and it causes problems to other software running on Java

REGRESSION. Last worked in version 7u71

STEPS TO FOLLOW TO REPRODUCE THE PROBLEM :
Install Java 1.7 update 75 or 76 (possibly on a machine with preinstalled Java 32bit whichever version)

EXPECTED VERSUS ACTUAL BEHAVIOR :
EXPECTED -
Existing path to jvm.dll should be set in registry runtimeLib
ACTUAL -
Non-existing path of jvm.dll is set in registry runtimeLib

REPRODUCIBILITY :
This bug can be reproduced always.

CUSTOMER SUBMITTED WORKAROUND :
Set the registry entry right after the installation