OBSDATA-9622: Cherry-pick from druid-25 and resolve conflicts#363

pinaki-basu wants to merge 2 commits into30.0.1-confluentconfluentinc/druid:30.0.1-confluentfrom

pinaki/brokerCpuTime-druid30confluentinc/druid:pinaki/brokerCpuTime-druid30Copy head branch name to clipboard