And fix my previous bad push.
I apologize folks !! my bad :-(

Conflicts:
	changelog.html
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java

[JENKINS-8651] Maven deployment with uniqueVersion == true creating "new" versions for attached artifacts

* JENKINS-8054:
  Set 'Aborted' result before invoking BuildWrapper's tearDown. Fixes JENKINS-7864 and JENKINS-8054.

* JENKINS-8670:
  [FIXED JENKINS-8670] recording the fix
  Added support to MavenBuild for alternateSettings

JENKINS-8670

Note that the above description is incorrect as to what the merge was about.
It is the message that I intended to make. It appears that I accidentaly merged multiple fixes waiting to be reviewed on my private fork.

This reverts commit dce0d2af, reversing
changes made to 63f67f30.

Classes that derive from FederatedIdentity are put into the session and should therefore be serializable

hudson.UDPBroadcastThread#testMulticast hangs when the network isn't enabled on my Linux box: joinGroup throws IOException and the ready lock isn't released.
This ready lock is only used in the tests.

It is slow and take 10sec on my compiter. Disabling it. One could remove it I guess.