properly quote where necessary and space-separate, instead of
comma-separating.

Change-Id: Ibf2e638d92591700c3a26f3402f306f5995552ad
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>