Merge "Remove unused javax.sql.rowset resources."