Remove UtilHelper.deep_copy for Rails deep_dup
Make Pry console available when ENV['PRY']=1
Make set_log_tag lazy, so that all controllers have a default behavior
Allow controllers to override log tag on their class, not on the instance
Make allowances for legacy behavior
Merge pull request #3058 from smarterclayton/use_deep_dup

Merged by openshift-bot
Merge pull request #3079 from smarterclayton/make_pry_console_available

Merged by openshift-bot
Add test cases for not_found messages and behavior
Formtastic can't be newer than 1.2.x
Merge pull request #3081 from smarterclayton/test_cases_for_not_found

Merged by openshift-bot
Merge pull request #3080 from smarterclayton/action_log_should_be_lazy

Merged by openshift-bot
Merge pull request #3082 from smarterclayton/formtastic_cant_be_too_new

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into handle_global_exceptions_properly

Conflicts:
	console/test/integration/rest_api/authorization_test.rb
	controller/app/controllers/alias_controller.rb