Merge pull request #14932 from phoet/use_file_join

always use File.join in asset_path
Conflicts:
	actionview/CHANGELOG.md