Commits

Dana Robinson committed 31d48a44467
Checkin of merge of file shutdown modifications into the page buffering merge branch. The failing mf tests have been disabled until they pass. (cherry-pick of 45965ba8957508f936791544ecdfddd2a676edbf)
Checkin of merge of file shutdown modifications into the page buffering merge branch. The failing mf tests have been disabled until they pass. (cherry-pick of 45965ba8957508f936791544ecdfddd2a676edbf)