Get rid of m_consumerLock

m_consumer is volatile + its readers assign it to a local variable
before using it.
Merge bug26122 into default