Merge "pjproject: Configurable setting for cnonce to include hyphens or not"