2.4.x

Fixing issues 
http://jira.codehaus.org/browse/GEOS-6410
and 
http://jira.codehaus.org/browse/GEOS-6411