Another gratuitous use of AbstractBuild removed in preparation for BuildStep-Job branch.
Merge branch 'master' into BuildStep-Job

Conflicts:
	src/main/java/hudson/tasks/JavadocArchiver.java