marker.

A build failure was reported, whose  root cause is that the central (http://repo2.maven.org/maven2/javax/mail/mail/1.4/mail-1.4.pom) and the source of the repository (http://maven.glassfish.org/content/groups/public/javax/mail/mail/1.4/mail-1.4.pom) have different POMs. So if your local repository was pre-populated with JavaMail from central you get this error.

Relaxing a rule a bit.

Also see https://github.com/cloudbees/maven-license-plugin/pull/1

Conflicts:
	war/pom.xml

pushed the winstone dependency to the <dependencies> so that we can see the source code during debugging

and I don't have the CA key.

Conflicts:
	changelog.html
	cli/pom.xml
	core/pom.xml
	maven-plugin/pom.xml
	plugins/pom.xml
	pom.xml
	remoting/pom.xml
	test/pom.xml
	ui-samples-plugin/pom.xml
	war/pom.xml

[FIXED JENKINS-6795] Maven agent needs a fix for the 'hardcoded' socket connection to localhost, perhaps a fallback mechanism when it fails to connect through the loopback interface can solve this pesky issue?

It actually contains one hunk that is necessary, but I'll merge it from
the 1.408 branch.

This reverts commit 6523693e.

This reverts commit 5c1007dd.

This reverts commit bd818192.

This reverts commit a903b3ab.

This reverts commit eb7292e1.