JCR-2054: Swap file is not removed after adding property to the DB