Remaining .xml files changed for 1.6 master