Rails 4.1.1 Upgrade

ElasticSearch major upgrade.
R411Upgrade Merge

Upgrades performed during the Rails 4.1.1 upgrade are needed during the 4.1.7 upgrade as well. So merging the branches.