Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix service discovery errors
Update with :unique_data
Land #4242, @Meatballs1 fix for sap_service_discovery report_note

* I cannot reproduce @Meatballs1 issue
* But I noticed report_note should :update with :unique_data
* Fixed the :update