Adjust provisioning configs to reduce configuration diff noise

This is a minor issue in a sense it can be viewed as cosmetic changes in provisioning configs. Its priority however will get higher once we start generating configuration diffs during provisioning.
The issue is that if build the default distribution today and compare it to itself, there will appear some differences in the configs. Those differences are not actual differences but simply noise. It is caused by the fact there are sometimes multiple ways to express the same configuration.
Applying the changes linked to this issue will avoid the diff noise and comparing the default distribution to itself won't produce any config diff.