Merge "Add better exception handling to config-persister-directory-adapter"