Correctly disabling the external entity loader.
Restoring xml entity loader setting.
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
	lib/Sabre/DAV/Version.php
Bumped version.