Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  CHANGES: building: Avoid duplicate and trailing spaces in the dependency files.