Fix test failures from 7d8a0788 with spaces in paths.
Merge topic 'xcode-shlib-versioning' into next

2ccdfd4 Fix test failures from 7d8a0788 with spaces in paths.