Merge "Ensure we close the file accounts file after reading"