XD-1491, XD-1492 Support Container Attributes

Added --groups command line arg

Renamed ContainerMetadata to ContainerAttributes