AMBARI-6538. Config Group rename makes it look like the default group name is also being changed. (Max Shepel via onechiporenko)
Merge remote-tracking branch 'origin/trunk' into trunk