edx/edx-platform — pull request #5291 by fmyzjs (2014-09-19 03:05:15+00:00)
Title: When s3fs cannot be accessed replaced with osfs

add var XBLOCK_FS_USE_S3_STORAGE ,default to be set True
When aws s3 service cannot be accessed or poor network,webmaster can replace s3fs with osfs