Properly save down the old component things in xmls.
Merge remote-tracking branch 'refs/remotes/AuroraDevelopers/master'