Merge branch '3.x' into 4.x

Author: adrienthebo

lib/puppet/parser/functions/str2bool.rb

@@ -14,6 +14,11 @@ module Puppet::Parser::Functions
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
     string = arguments[0]
+    
+    # If string is already Boolean, return it
+    if !!string == string
+      return string
+    end
 
     unless string.is_a?(String)
       raise(Puppet::ParseError, 'str2bool(): Requires either ' +

spec/unit/puppet/parser/functions/str2bool_spec.rb

@@ -21,4 +21,11 @@
     result = scope.function_str2bool(["undef"])
     result.should(eq(false))
   end
+  
+  it "should return the boolean it was called with" do
+    result = scope.function_str2bool([true])
+    result.should(eq(true))
+    result = scope.function_str2bool([false])
+    result.should(eq(false))
+  end
 end