Client xml and xsd tests
added methods back that are removed by mistake
checkstyle fixes for equals methods.
Merge pull request #2590 from sancar/fix/clientXmlConfig/maint3.x

Client Xml and Xsd config tests and fixes