OS X: Fix bug with making unique rpaths.
Merge topic 'osx-rpath-unique' into next

3b8329f5 OS X: Fix bug with making unique rpaths.