[#2037] Ensure cookies are unique

Last occurence win
Improve executeQuery/SqlQueryResult tests (SQL warning specs)
Merge pull request #2041 from baloo/improvements/2037-withSessions

[#2037] Ensure cookies are unique
Merge pull request #2039 from cchantep/cchantep-anorm-acolyte

Improve executeQuery/SqlQueryResult tests (SQL warning specs)
Merge commit '2ec38dec548e45c99c82e15cfc698ddac6de6b5f'

Conflicts:
	framework/project/Build.scala
	framework/project/Dependencies.scala