Reproduce JENKINS-17713
Merge branch 'master' into jenkins17713

Conflicts:
	features/maven.feature
	features/step_definitions/maven_steps.rb