Rails 5

Created by: v-kumar

1. Merge latest master
2. Update sass-3-4 Gemfile to fix assert_template dependency error on rails-controller-testing gem.
3. Update rubocop defs to support latest rubocop.
4. Make specs pass in all appraisals.