merge changes from glassfish svn