Fix incorrect commit where URL of Codehaus was changed
Automatic merge from branch-5.0

* origin/branch-5.0:
  Fix incorrect commit where URL of Codehaus was changed