Merge "Add system.prometheus.*.container classes"