Merge changes from jameskyle for [bugs:#2646] sblim-sfcc does not compile on apple systems