Adding ws-discovery-core
Fixing confilct
Fixing conflicts