3.x - archetype 3.3.0 compat & backports

[romain-grecourt]

Backport of #1070 to 3.x

Also backport the following to ease the cherry picking:

• 1070

• 1056

• 1046

• 1043

• 1037

• 1035

• 1029

• 1027

• 1025

• 1024

• 1023

• 1022

• 1021

• 1020

• 1019

• 1004