Merge "Define CMD in smoke and healthcheck containers"