Merge pull request #1947 from Wikia/bac-948-short-swift-bucket-names-fix

BAC-948: Fix for too short Swift bucket names

#1947 ported to release