Standard config pass part 2
2-DEV-147 update with XML and friends

Will be used to cut releases as 2.8.6.0.