Trap for new SystemExit in puppets >= 3.4.0
Fix rspec tests for puppets >= 3.4.0 and make error message checking more adaptable