Add back changes that fix deprecation warning related to autoloading in Rails 6#255

Hirurg103 wants to merge 2 commits intoSorcery:mainSorcery/sorcery:mainfrom

Hirurg103:masterHirurg103/sorcery:masterCopy head branch name to clipboard