Merge branch '2.x' into 3.x

* 2.x:
  changed .count to .size to support legacy ruby

Author: Jeff McCune

lib/puppet/provider/file_line/ruby.rb

@@ -34,7 +34,7 @@ def lines
 
   def handle_create_with_match()
     regex = resource[:match] ? Regexp.new(resource[:match]) : nil
-    match_count = lines.select { |l| regex.match(l) }.count
+    match_count = lines.select { |l| regex.match(l) }.size
     if match_count > 1
       raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
     end