fix merge issue in spring xml configuration files for document service