Fail with 409 if rebase of change edit fails due to conflicts

With this the user gets a proper error message displayed, rather then
getting the generic 'Server Error' message.

Change-Id: Icd60ebaff7756906899293ba689dc3e77be63431
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
2 files changed