Move ADDITIONAL_DEFAULT_PROPERTIES from build here (3/3)

We use a product variable instead