First Pass at Merging with continued XML dev

A first pass at merging with the XML dev stream; has a handful of errors
due to missing JARs.  Checking in to finish merge tomorrow.