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

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