BZ-1105174: adapted config services to use same WatchService pattern; Small refactoring on WatchService on package naming; Updated EJB dependency;
BZ-1105174: cleaning now the correct collection