(FACT-134) Redo tests so the work on ruby 1.8.x

No String#encode or Encoding in ruby 1.8.x, update tests accordingly.
Merge remote-tracking branch 'upstream/facter-2'

* upstream/facter-2:
  (FACT-134) Redo tests so the work on ruby 1.8.x

Conflicts:
	spec/unit/util/resolution_spec.rb