Merge branch 'master' of github.com:edx/edx-platform
add a try catch around the staticstorage lookup, which can throw an exception