JDOM XXE Protection

Conflicts:
	activesupport/test/xml_mini/jdom_engine_test.rb

Conflicts:
	activesupport/test/xml_mini/jdom_engine_test.rb
fix protocol checking in sanitization [CVE-2013-1857]