[AMOS commit] MDL-27408 fix a few minor bugs with the upgrade from 2.0. Committed into Git: 2011-05-12 20:03 UTC