Merge "Removes leftover self.conf from isolated creds"