am eaabe7c8: Merge "Cleanup orphaned workspace items on db upgrade" into ub-now-mister-ugly

* commit 'eaabe7c89a778afdcc0c0be538bff807ea1304ae':
  Cleanup orphaned workspace items on db upgrade