Don't strip quotes for values that can validly be quoted strings
Always quote icid-values
Remove accidental commit
Merge pull request #512 from Metaswitch/iss510

[Reviewer: Matt] Don't strip quotes for values that can validly be quoted strings