Merge "Don't walk mutexed collections outside the mutex" into nyc-mr1-dev