Fix headers
Update Issue 279

Backport to community master : Fixing issue with derived sessions invalidation

(cherry picked from commit a4549ffcd457ac12d8969ac11c50f2b8b948ada2)

Conflicts:
	pom.xml