merge 2014-06-04 to 2014-06-08 changes from upstream illumos-gate master

merge 2014-06-04 to 2014-06-08 changes from upstream illumos-gate master