Add return early statements for redirecting in controllers.
rename method
Merge pull request #2601 from dereuromark/2.5-upgrade

2.5 upgrade