For GERONIMO-4296, Forrest has done some testing and committed it into both branch 2.1 and 2.2.
 
 
Janet