[discovery]
- adding the changes for the discovery agent
- allowing push event to the proxy
- adding the changes
- fixing the merge conflict