Merge branch '4.0' into 4.1

Conflicts:
	railo-cfml/railo-admin/admin/resources/language/en.xml
Merge remote-tracking branch 'origin/4.1' into 4.1