Use easier-to-type dashes instead of underscores for generating random c...

...ontainer names

Fixes #2631