Merge pull request #759 from pragupta/master-next

Reverting hostboot to a level that works with witherspoon pnor