Merge "Remove trailing spaces from property files"