BAC-1010: resolve short Bucket names issue

https://wikia-inc.atlassian.net/browse/BAC-1010

@moliwikia