Fix for commas in allowed values of properties

Change-Id: Iabc4c0e604484344342cb6538f00c73533cbc674