Respect id length when changing conflicting id.
Authored by: jimwinston 2011-03-30
Parent: [r983]
Child: [r985]