Better handling of issue update conflicts (#8691).
Authored by: jplang 2012-02-04
Parent: [r8773]
Child: [r8775]