minor improvements to ControlGroup, mark ControlGroupBorder as deprecate...