Up the client limit for targets in COMSTAR
Make sure we include the local header file
Merge branch 'master' of https://github.com/cloudsigma/illumos-omnios