Merge created two local_id properties, removing one of them.
Authored by: b_calderwood 2012-09-19
Parent: [r6360]
Child: [r6362]