Sync archetype with the updates from the quickstart

Once other updates to the quickstarts are completed for M3 the archetype much be synchronized with those updates.

Be careful not to overwrite changes that may only be applied to the archetype.