MutableIter impl for Option + use it in treemap
auto merge of #5395 : thestinger/rust/iter, r=pcwalton