Conflicts:
	core/src/main/java/hudson/model/DependencyGraph.java

according to rfc2307 which says the memberUid is a name (not a uid
strangely enough)

just going by
http://manpages.ubuntu.com/manpages/natty/man5/sssd-ldap.5.html
ldap_schema description and my broken install on ubuntu...

I can't say what ldif I used except it was standard (I didn't write it)
and ldapscripts and phpmyadmin all seem to want the field to be a name.

Possible fix for JENKINS-9806, fix empty customWorkspace -if empry, replace it by null (i.e. no custom workspace)

properties.

[FIXED JENKINS-9807] : [Maven Jobs] Post build deploy task : Deploy with unique versions (timestamp) should be configured by default

Dependency

Replace crappy VersionNumber with better implementation.

replace old CDDL+GPLv2 Version Number comparator with one that is both ASL and has a better understanding of Maven version numbers (with some tweaks for wildcard support)

o Had to change the logic of two test cases (2.0 is now newer than 2.0.ea and 1.12-SNAPSHOT is no longer equal to 1.11.*) both of which make more sense than the original test cases

o Should now allow custom builds with text/alpha qualifiers in the version number.

* origin/master: (28 commits)
  Need to run install during prepare, or else the release:perform fails miserably.
  Enabled more convenient access to the XSTREAM field
  added a method to help plugins rename classes and still keep backward compatibility
  Rely on released versions
  Test files accidentally crept in.
  modified to use the type-safe tag lib interface.
  Hooking the taglib interface generation.
  [JENKINS-9326] add integration tests with eclipse tycho relocation
  experimenting with the taglib interface generator
  fixed NPE
  Converted a few more pages into Groovy to test the behaviour. Allow global.jelly to be written in Groovy.
  Jenkins
  auto-completes instance and descriptor
  Support global.groovy as well as config.groovy
  A few more Jelly files switched to Groovy as a test
  Looks like a dead code.
  added DSLD for Eclipse
  1.166 shipped
  not specifying the file extension so that different pieces can be implemented by different view technologies
  replaced i18n by '_' since it shows up a lot.
  ...

Conflicts:
	core/src/main/java/hudson/model/Hudson.java

the root name of a system property. Obviously changing the root class
name breaks this. So introduce a simple Configuration class that is
used to first try Jenkins variables, then back off to Hudson variables
if not found.
Signed-off-by: NNigel Magnay <nigel.magnay@gmail.com>

* origin/master: (91 commits)
  Parsing can happen in the forked Maven process. Support remoting.
  Fixed the test failures.
  Strip whitespace on maven installation.
  updated ja.
  Use relative path to validate new view name (in order to allow ViewGroups like NestedView to override)
  Added i18n.
  moved to the model package to colocate with the Result class, since I don't think this class is tied by itself to the notification.
  doc improvements
  enum to describe a result trend - i.e. change from the previous to the current result
  Recording the previous change.
  Do not include trailing periods in console links.
  doc improvements
  Added a hook to customize the XML parser behaviour.
  - Renamed from 'linked' to 'base' - Fixed the bug where multi-level base setting wasn't working properly - Improved docs
  Updated style
  Added convenience method for getting configuration run
  Initial commit
  the trunk is toward 1.416-SNAPSHOT
  creating an RC branch
  updated changelog as a part of the release
  ...

Conflicts:
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	maven-plugin/src/main/java/hudson/maven/MavenModule.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java

miserably.

Conflicts:
	core/src/main/java/hudson/ExtensionComponent.java
	core/src/main/resources/hudson/PluginManager/sidepanel.jelly