Merge "Container Services underscore in metadata key translate to dash"