Merge pull request #8154 from lioncash/analytics {Common/Analytics, Core/Analytics}: Minor C++17 transitional changes
