Bring default.xml up to date with CM