Update for address or service names with spaces.

Corrected a parsing error where address or service entries with
spaces in the name were being added as multiple entries into the
policy object.