Another MacOSX rpath fix

Version comparison was wrong. 2.8.11.x is greater 2.8.11 and thus
was using the 2.8.12 method.

Change-Id: I3eda8c6239ad13194a04fa1da59e99adf2e68519
Merge branch 'release-4-6' into release-5-0

Conflicts:
	CMakeLists.txt
Left CMake version condition in favour of new fix from release-4-6;
actual settings logic from release-5-0.

Change-Id: I493571b2aca74647a7547d5c2d9463679bdd858a
Merge "Merge branch 'release-4-6' into release-5-0" into release-5-0