Fixes #7427 - Avoid use of params local variables
Merge pull request #4656 from daviddavis/temp/20140912125518

Fixes #7427 - Avoid use of params local variables in controllers