Backport non-functional changes from master to facter-2