Disable test on all Solaris platforms.
(cherry picked from commit 30ed827dead8def623327a00dd8f40e16600bf23)
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x_surfsara
added cf-locate to installat in /usr/sbin