Standardise the hiera.yaml formats