2-DEV-161 XML update and cleanup

Will be used to cut stable releases as 2.9.2.3