refactoring to make logic more obvious
refactoring to make logic more obvious

Conflicts:
	lib/cucumber/formatter/junit.rb

CW5000/CWFDerpy,danascheider/cucumber-ruby,enkessler/cucumber-ruby,sideci-sample/sideci-sample-cucumber,tom025/cucumber,shivashankar2020/mands,phoebeclarke/cucumber-ruby,martinma4/cucumber-ruby,nfredrik/cucumber-ruby,cucumber/cucumber-ruby,shivashankar2020/mands,shivashankar2020/mands,marxarelli/cucumber,twalpole/cucumber,richarda/cucumber,phoebeclarke/cucumber-ruby,marxarelli/cucumber,CW5000/CWFDerpy,danascheider/cucumber-ruby,richarda/cucumber,brasmusson/cucumber,enkessler/cucumber-ruby,tom025/cucumber,martinma4/cucumber-ruby,tom025/cucumber,jasonkarns/cucumber-ruby,sideci-sample/sideci-sample-cucumber,brasmusson/cucumber,shadow000902/cucumber-ruby,jasonkarns/cucumber-ruby,jasonkarns/cucumber-ruby,cucumber/cucumber-ruby,dg-ratiodata/cucumber-ruby,nfredrik/cucumber-ruby,dg-ratiodata/cucumber-ruby,dg-ratiodata/cucumber-ruby,enkessler/cucumber-ruby,twalpole/cucumber,shadow000902/cucumber-ruby,cucumber/cucumber-ruby