Updated version of my original PR #7292 to incorporate nested group changes

My previous PR for the expanding of CSV values in ec2 tags did not merge cleanly with the current devel HEAD, so have updated the patches to resolve this.