Junking the patch from 18557, I accidentally added exactly the same change on
the default branch without checking wether there was a branch fpor that
change.
Merge mis-named 21930 branch into junk
Merging bug 22841 onto junk
merge bug20911 into junk
it is a dup of bug21930
Merged bug23079 into junk
merge bug24216 into junk
merge bug24247 into junk
Junk bug24703
Merged bug24381 into junk
Junk bug24013.
merge bug25059 into junk
Junk bug25125
junked bug25016
Junk bug24407