Fix four tests, ignore two that appear to be works in progress.
Clean up no longer used classes and tests.
Minor formatting changes only.
Import cleanup only.
Fix Multi-bindings setup, which requires a Set and not a List for injected multi-bindings.
Give two Guice-created objects EntityDeleted and EntityVersionDeletedImpl, access to the Spring-created EntityManagerFactory, also: test fixes.