Merge branch 'master' into feature/childControlIDs_childControlNames_of_group
[[ ChildControlProps ]] Added a check to see if there were no child controls of a group to avoid empty lines being added to the list. Also moved where t_prop was being set because it doesn't need to happen each iteration.
[[ Bug 11379 ]] Added release note.
Merge branch 'bugfix-11379' into release-6.1.3