BAC-1010: resolve short Bucket names issue
Merge pull request #1997 from Wikia/release-195-short-buckets

BAC-1010: resolve short Bucket names issue