am 8e21bc54: Merge "Fixing issue where items that were not yet added were not removed from the db. (Bug 6428418)" into jb-dev

* commit '8e21bc54113bf361d959f2c5934035b15f949379':
  Fixing issue where items that were not yet added were not removed from the db. (Bug 6428418)