Merge "Fix tempest.skiplist name for deployments with non-default name"