Use a short_id for naming Swift containers

Change-Id: Id6ee6b92f05326e3feda3f2b770fff5864e38e19
Signed-off-by: Zane Bitter <zbitter@redhat.com>