Fix puppet parser on Foreman > 1.6 again

Also fixes case where one fact is upcase, second downcase