Merge pull request #18100 from chancancode/serve_static_files

Allow static asset serving from env variable (enhanced!)
Conflicts:
	railties/CHANGELOG.md