generate key on our own unless one is explicitly given
this is not auto-injected
removed all the old individual file reference
Merge branch 'master' of github.com:jenkinsci/acceptance-test-harness

Conflicts:
	ec2.groovy
	src/main/java/org/jenkinsci/test/acceptance/controller/Ec2Provider.java
	src/main/java/org/jenkinsci/test/acceptance/controller/JenkinsProvider.java