Merge "Disable Sensu support by default"