Core's set.xml is normalized

Will go over all set xml's one more time to double check work and then
merge back in to the master branch..