Fix a potential deadlock in OutOfDiskSpaceTest
Merge pull request #2612 from chrisvest/2.2-pagecachemonitor-deadlock

Fix a potential deadlock in OutOfDiskSpaceTest