Merge pull request #5080 from dcrowell77/fix-rainier-xml

Resynchronize rainier-xml commit tag in fw1020