Fix some missing requires
Add some missing requires
Prefer register engine with proper extension
Merge branch 'master' into 4.x

Conflicts:
	lib/sprockets/base.rb
Drop normalize extension