Merge pull request #398 from puppetlabs/master

Pull in RSpec 3.0 fixes.

Author: hunner

spec/acceptance/fqdn_rotate_spec.rb

@@ -21,7 +21,7 @@
     after :each do
       shell("if [ -f '#{facts_d}/fqdn.txt' ] ; then rm '#{facts_d}/fqdn.txt' ; fi")
     end
-    before :all do
+    before :each do
       #No need to create on windows, PE creates by default
       if fact('osfamily') !~ /windows/i
         shell("mkdir -p '#{facts_d}'")