CLC-4509 Rails 4.1.8 upgrade
Merge pull request #3132 from ctweney/clc-4509

CLC-4509 Rails 4.1.8 upgrade