Drop specific global engine config tests
Merge branch 'master' into asset-content-negotiation

Conflicts:
	test/test_engines.rb