Fixes #7816 - Refactor strong_params code
Merge pull request #4704 from daviddavis/temp/20141004162439

Fixes #7816 - Refactor strong_params code