Merge "Validate persistent properties file"