Merge with guice config package removal
Make RG compatible with new Guice without config package