Merge branch 'master' into overlay_change

Switch iter function to use optional child trie reference (to get
same iterator type between top and child when needed).
Remove comment about 'into_commited' panicking (into_commited
no longer panic when there is prospective).