Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	lib/puppet/type/tidy.rb
	spec/unit/type/file/ensure.rb
	spec/unit/type/tidy.rb

1 files changed, 3 insertions, 1 deletions

diff --git a/bin/ralsh b/bin/ralsh
index 3cbfcad41..5dae8f130 100755
--- a/bin/ralsh
+++ b/bin/ralsh
@@ -192,7 +192,9 @@ properties = typeobj.properties.collect { |s| s.name }
 
 format = proc {|trans|
     trans.dup.collect do |param, value|
-        if value == "" or value == []
+        if value.nil? or value.to_s.empty?
+            trans.delete(param)
+        elsif value.to_s == "absent" and param.to_s != "ensure"
             trans.delete(param)
         end