Copied v7 valve concurrency fixes to v6
Authored by: haggish 2012-10-25
Parent: [r291]
Child: [r293]