JCR-2054: Swap file is not removed after adding property to the DB
JCR-2064: Small error of syntax in the organization-service-listener.xml file