Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error

Use dynamic path for dummy app location in plugin's test_helper.rb
Conflicts:
	railties/CHANGELOG.md