merge in OpenIndiana changes from 2014 January, will revert oi-specific branding to keep illumos

merge back OpenIndiana changes from 2014 January,
but will revert 45a86ff and  f5083a6 ASAP before re-merge
(oi-specific branding, will keep illumos tags+brand)