Need to address the following findbug errors in WebRowSetXmlWriter

Need to address the following findbug errors in WebRowSetXmlWriter:

Inefficient use of keySet iterator instead of entrySet iterator

and

non-serializable instance field in serializable class