Controlgroup: Address #6163.
Unit tests: Controlgroup: Make sure options are applied correctly to pre-rendered controlgroups (issue #6163).