KER-239: fixes needed to be able to implement a guice integration