1) revert to old solution with OverrideModule
2) reference to guice-4.0-beta4
3) release x-guice 4.0-beta4-2

Change-Id: I9cfa51111b063bf54f12fce62aa210017247a926