SAMZA-163: Remove mutable.ConcurrentMap when we stop supporting 2.9