SAL_OVERRIDE, Mac OS X connectivity redux

Change-Id: I9d4ef90501c9c36c77991d9521d08b327c3d0d5c