Refs #2584. Check if the quoted comma exists and then unquote it so the comma is considered as a chosen option

Change-Id: Ib048c371c2dbd271cc59da5f93caf8ead87dbe72