HV-740 REverting change to BootstrapConfigurationImpl