#1639 Better Solaris OS detection
Merge pull request #1640 from aszeszo/master

More robust Solaris detection