Merge "Properly handle whitespace in domain entries" into nyc-dev