Separate builder properties to include non-free-firmware and/or contrib

Currently there is only the free property. If it is False, then contrib and non-free-firmware components are added to the image.

I propose to replace it with separate properties: