Merge pull request #12085 from valk/master

FIX reload! within rails console --sandbox causes undefined method rollb...