Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_words

Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
Merge pull request #11778 from jetthoughts/11759_update_assets_guides

Update Assets Pipeline Guide [ci skip]
Conflicts:
	guides/source/asset_pipeline.md