Update to compile to private xwam file and load before renaming. Should have been checked in with other changes a few days ago.
Authored by: dwarren 2019-09-18
Parent: [r9636]
Child: [r9638]
