Merge revisions r1453590,1454307 from branches/fsfs-format7. These introduce base36 conversion routines.