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

BAC-948: Fix for too short Swift bucket names
BAC-948: change directory name if wgUploadDirectoryNFS is enabled
Merge pull request #1960 from Wikia/release-195-short-swift-names

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