std: Remove Option.or_{default,zero}

These can be replaced with `Some(option.or_default())`.
extra: minor cleanup of Zero and Default syntax extension
auto merge of #9279 : erickt/rust/master, r=alexcrichton

`Some(5).or_{default,zero}` can be easily replaced with `Some(Some(5).unwrap_or_default())`.