Add option --name-by-service for container names

Change-Id: I431a6a4d9975f1abbf7178dea24c88061ae344c5