added testcase for ticket 2825
solved ticket https://issues.jboss.org/browse/RAILO-2821
added testcase for ticket 2807
solved ticket https://issues.jboss.org/browse/RAILO-2807
Merge branch '4.1' into 4.2

Conflicts:
	tests/testcases/tickets/Jira2825.cfc