Merge branch 'rc' into main

* rc:
  Revert "1.387 special"
  updated changelog as a part of the release
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release hudson-1_387
  preparing for a release
  updated with changes
  updated changelog
  imported from svn
  1.387 special