pulling changes from OpenIndiana illumOS-gate minus branding

merging OpenIndiana changes from 2014 January 19, reverting oi-specific branding in 45a86ff .. f5083a6