Add DiscoveryManager.getDiscoveryRules()
Add update of discovery rules
Merge remote-tracking branch 'origin/development' into development