This simplifies the DSMRHandlerFactory code so it no longer needs to register and keep track of a discovery service for each bridge. Also contains a few other improvements: * more constructor injection * add a few missing @NonNullByDefault on test classes Signed-off-by: Wouter Born <github@maindrain.net>