merged disk buffer pool change from RC_0_16
fix the off-by-one errors in file_storage as well as a NULL conversion warning (typo)
fix build