Handle Galera deadlock on SELECT FOR UPDATE

Using nova-api in the wild shows that we've got an additional
exception, that must be treated like a deadlock, so that we
can handle this error properly and retry the transaction.

Closes-Bug: #1394298

Change-Id: If75f2b5984979fe55ad04ccec8713989307c56ae
Updated from global requirements

Change-Id: I8a909d181302ea1c898dcdf1ce13a9e4681217f8
Merge "Handle Galera deadlock on SELECT FOR UPDATE"
Merge "Updated from global requirements"