BAC-1010: resolve short Bucket names issue