Merge "Fixed whitespace dependent tests in config-persister-directory-adapter"