Improve tests as Service.equals() only tests Id
Add support for mapping the "general" pool.
Remove unused resource method
Support migration from previous discovery server versions